X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=libview%2Fev-view.c;h=815571c9efba55eda26da7507311d21b005bbffc;hb=22a76eb4d52da8548b31c215a117ef7048573695;hp=2bbca10b543ae172eaa9eac51ab15cc4498d0e1e;hpb=c654504ee0622a7eec0a24aacaad44dac6fa0be5;p=evince.git diff --git a/libview/ev-view.c b/libview/ev-view.c index 2bbca10b..815571c9 100644 --- a/libview/ev-view.c +++ b/libview/ev-view.c @@ -40,6 +40,7 @@ #include "ev-view.h" #include "ev-view-accessible.h" #include "ev-view-private.h" +#include "ev-view-type-builtins.h" #define EV_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EV_TYPE_VIEW, EvViewClass)) #define EV_IS_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EV_TYPE_VIEW)) @@ -1767,10 +1768,10 @@ ev_view_form_field_text_create_widget (EvView *view, g_free (txt); } - g_signal_connect (G_OBJECT (text), "changed", + g_signal_connect (text, "changed", G_CALLBACK (ev_view_form_field_text_changed), field); - g_signal_connect_after (G_OBJECT (text), "activate", + g_signal_connect_after (text, "activate", G_CALLBACK (ev_view_form_field_destroy), view); break; @@ -1785,7 +1786,7 @@ ev_view_form_field_text_create_widget (EvView *view, g_free (txt); } - g_signal_connect (G_OBJECT (buffer), "changed", + g_signal_connect (buffer, "changed", G_CALLBACK (ev_view_form_field_text_changed), field); } @@ -1959,10 +1960,10 @@ ev_view_form_field_choice_create_widget (EvView *view, gtk_container_add (GTK_CONTAINER (choice), tree_view); gtk_widget_show (tree_view); - g_signal_connect (G_OBJECT (selection), "changed", + g_signal_connect (selection, "changed", G_CALLBACK (ev_view_form_field_choice_changed), field); - g_signal_connect_after (G_OBJECT (selection), "changed", + g_signal_connect_after (selection, "changed", G_CALLBACK (ev_view_form_field_destroy), view); } else if (field_choice->is_editable) { /* ComboBoxEntry */ @@ -1975,10 +1976,10 @@ ev_view_form_field_choice_create_widget (EvView *view, g_free (text); } - g_signal_connect (G_OBJECT (choice), "changed", + g_signal_connect (choice, "changed", G_CALLBACK (ev_view_form_field_choice_changed), field); - g_signal_connect_after (G_OBJECT (GTK_BIN (choice)->child), "activate", + g_signal_connect_after (GTK_BIN(choice)->child, "activate", G_CALLBACK (ev_view_form_field_destroy), view); } else { /* ComboBoxText */ @@ -1995,10 +1996,10 @@ ev_view_form_field_choice_create_widget (EvView *view, gtk_combo_box_set_active (GTK_COMBO_BOX (choice), selected_item); gtk_combo_box_popup (GTK_COMBO_BOX (choice)); - g_signal_connect (G_OBJECT (choice), "changed", + g_signal_connect (choice, "changed", G_CALLBACK (ev_view_form_field_choice_changed), field); - g_signal_connect_after (G_OBJECT (choice), "changed", + g_signal_connect_after (choice, "changed", G_CALLBACK (ev_view_form_field_destroy), view); } @@ -5831,22 +5832,6 @@ ev_view_previous_page (EvView *view) /*** Enum description for usage in signal ***/ -GType -ev_sizing_mode_get_type (void) -{ - static GType etype = 0; - if (etype == 0) { - static const GEnumValue values[] = { - { EV_SIZING_FIT_WIDTH, "EV_SIZING_FIT_WIDTH", "fit-width" }, - { EV_SIZING_BEST_FIT, "EV_SIZING_BEST_FIT", "best-fit" }, - { EV_SIZING_FREE, "EV_SIZING_FREE", "free" }, - { 0, NULL, NULL } - }; - etype = g_enum_register_static ("EvSizingMode", values); - } - return etype; -} - void ev_view_update_view_size (EvView *view, GtkScrolledWindow * scrolled_window) {