X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-window.c;h=523a8c6aa164342bde35b792b2512eb5f026ef21;hb=cdba8578739fd46880c53fdacc66c58b38278506;hp=54db1498467b1071ca47e4d22c8641bf5bb0641b;hpb=fe8a90e5ecdc21069bc6617f07b7ab12a5a4a012;p=evince.git

diff --git a/shell/ev-window.c b/shell/ev-window.c
index 54db1498..523a8c6a 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -61,6 +61,7 @@
 #include "ev-document-images.h"
 #include "ev-document-links.h"
 #include "ev-document-thumbnails.h"
+#include "ev-document-type-builtins.h"
 #include "ev-file-exporter.h"
 #include "ev-file-helpers.h"
 #include "ev-file-monitor.h"
@@ -86,6 +87,7 @@
 #include "ev-utils.h"
 #include "ev-keyring.h"
 #include "ev-view.h"
+#include "ev-view-type-builtins.h"
 #include "ev-window.h"
 #include "ev-window-title.h"
 #include "ev-print-operation.h"
@@ -1073,7 +1075,7 @@ setup_view_from_metadata (EvWindow *window)
 	/* Sizing mode */
 	if (ev_metadata_manager_get (uri, "sizing_mode", &sizing_mode, FALSE)) {
 		enum_value = g_enum_get_value_by_nick
-			(EV_SIZING_MODE_CLASS, g_value_get_string (&sizing_mode));
+			(g_type_class_peek (EV_TYPE_SIZING_MODE), g_value_get_string (&sizing_mode));
 		g_value_unset (&sizing_mode);
 		ev_view_set_sizing_mode (view, enum_value->value);
 	}
@@ -1433,7 +1435,7 @@ ev_window_load_job_cb (EvJob *job,
 
 		/* Create a monitor for the document */
 		ev_window->priv->monitor = ev_file_monitor_new (ev_window->priv->uri);
-		g_signal_connect_swapped (G_OBJECT (ev_window->priv->monitor), "changed",
+		g_signal_connect_swapped (ev_window->priv->monitor, "changed",
 					  G_CALLBACK (ev_window_document_changed),
 					  ev_window);
 		
@@ -2332,7 +2334,7 @@ ev_window_setup_recent (EvWindow *ev_window)
 					gtk_recent_info_ref (info),
 					(GDestroyNotify) gtk_recent_info_unref);
 		
-		g_signal_connect (G_OBJECT (action), "activate",
+		g_signal_connect (action, "activate",
 				  G_CALLBACK (ev_window_cmd_recent_file_activate),
 				  (gpointer) ev_window);
 
@@ -2947,13 +2949,13 @@ ev_window_print_range (EvWindow *ev_window,
 		ev_window->priv->print_queue = g_queue_new ();
 
 	op = ev_print_operation_new (ev_window->priv->document);
-	g_signal_connect (G_OBJECT (op), "begin_print",
+	g_signal_connect (op, "begin_print",
 			  G_CALLBACK (ev_window_print_operation_begin_print),
 			  (gpointer)ev_window);
-	g_signal_connect (G_OBJECT (op), "status_changed",
+	g_signal_connect (op, "status_changed",
 			  G_CALLBACK (ev_window_print_operation_status_changed),
 			  (gpointer)ev_window);
-	g_signal_connect (G_OBJECT (op), "done",
+	g_signal_connect (op, "done",
 			  G_CALLBACK (ev_window_print_operation_done),
 			  (gpointer)ev_window);
 
@@ -4082,7 +4084,7 @@ save_sizing_mode (EvWindow *window)
 	GEnumValue *enum_value;
 
 	mode = ev_view_get_sizing_mode (EV_VIEW (window->priv->view));
-	enum_value = g_enum_get_value (EV_SIZING_MODE_CLASS, mode);
+	enum_value = g_enum_get_value (g_type_class_peek (EV_TYPE_SIZING_MODE), mode);
 
 	if (!ev_window_is_empty (window))
 		ev_metadata_manager_set_string (window->priv->uri, "sizing_mode",