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,
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);
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));
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) {
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);