Fix memory leak.

[evince.git] / shell / ev-application.c

diff --git a/shell/ev-application.c b/shell/ev-application.c
index 7f912f2deae67e3e804c2b43979f73eecc6b7aa3..53d284f1fad805d28f234b1fe91de26edce896e7 100644 (file)
--- a/shell/ev-application.c
+++ b/shell/ev-application.c
@@ -75,7 +75,6 @@ ev_application_register_service (EvApplication *application)
                                                  DBUS_PATH_DBUS,
                                                  DBUS_INTERFACE_DBUS);
 
-#if DBUS_VERSION >= 60 
        if (!org_freedesktop_DBus_request_name (driver_proxy,
                                                APPLICATION_SERVICE_NAME,
                                                DBUS_NAME_FLAG_DO_NOT_QUEUE,
@@ -83,14 +82,6 @@ ev_application_register_service (EvApplication *application)
                g_warning ("Service registration failed.");
                g_clear_error (&err);
        }
-#else
-       if (!org_freedesktop_DBus_request_name (driver_proxy,
-                                               APPLICATION_SERVICE_NAME,
-                                               0, &request_name_result, &err)) {
-               g_warning ("Service registration failed.");
-               g_clear_error (&err);
-       }
-#endif 
 
        g_object_unref (driver_proxy);
        
@@ -98,18 +89,14 @@ ev_application_register_service (EvApplication *application)
                return FALSE;
        }
 
-#if DBUS_VERSION == 33
-       dbus_g_object_class_install_info (G_OBJECT_GET_CLASS (application),
-                                         &dbus_glib_ev_application_object_info);
-#else
        dbus_g_object_type_install_info (EV_TYPE_APPLICATION,
                                         &dbus_glib_ev_application_object_info);
-#endif
-
        dbus_g_connection_register_g_object (connection,
                                             "/org/gnome/evince/Evince",
                                              G_OBJECT (application));
-
+       
+       application->scr_saver = totem_scrsaver_new (connection);
+       
        return TRUE;
 }
 #endif /* ENABLE_DBUS */
@@ -358,10 +345,36 @@ ev_application_open_uri_at_dest (EvApplication  *application,
                                 gboolean        unlink_temp_file,
                                 guint           timestamp)
 {
-       EvWindow *new_window;
+       EvWindow     *new_window;
+       GtkIconTheme *icon_theme;
 
        g_return_if_fail (uri != NULL);
 
+       icon_theme = gtk_icon_theme_get_for_screen (screen);
+       if (icon_theme) {
+               gchar **path = NULL;
+               gint    n_paths;
+               gint    i;
+               gchar  *ev_icons_path;
+
+               /* GtkIconTheme will then look in Evince custom hicolor dir
+                * for icons as well as the standard search paths
+                */
+               ev_icons_path = g_build_filename (DATADIR, "icons", NULL);
+               gtk_icon_theme_get_search_path (icon_theme, &path, &n_paths);
+               for (i = n_paths - 1; i >= 0; i--) {
+                       if (g_ascii_strcasecmp (ev_icons_path, path[i]) == 0)
+                               break;
+               }
+
+               if (i < 0)
+                       gtk_icon_theme_append_search_path (icon_theme,
+                                                          ev_icons_path);
+
+               g_free (ev_icons_path);
+               g_strfreev (path);
+       }       
+
        new_window = ev_application_get_uri_window (application, uri);
        
        if (new_window == NULL) {
@@ -379,7 +392,9 @@ ev_application_open_uri_at_dest (EvApplication  *application,
           we can restore window size without flickering */     
        ev_window_open_uri (new_window, uri, dest, mode, unlink_temp_file);
 
+       ev_document_fc_mutex_lock ();
        gtk_widget_show (GTK_WIDGET (new_window));
+       ev_document_fc_mutex_unlock ();
 
        gtk_window_present_with_time (GTK_WINDOW (new_window),
                                      timestamp);
@@ -551,3 +566,14 @@ const gchar* ev_application_get_chooser_uri (EvApplication *application)
        return application->last_chooser_uri;
 }
 
+void ev_application_screensaver_enable  (EvApplication   *application)
+{
+       if (application->scr_saver)
+               totem_scrsaver_enable (application->scr_saver); 
+}
+
+void ev_application_screensaver_disable (EvApplication   *application)
+{
+       if (application->scr_saver)
+               totem_scrsaver_disable (application->scr_saver);        
+}