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));
-
+
+ application->scr_saver = totem_scrsaver_new (connection);
+
return TRUE;
}
#endif /* ENABLE_DBUS */
return dest;
}
+static gboolean
+get_unlink_temp_file_from_args (GHashTable *args)
+{
+ gboolean unlink_temp_file = FALSE;
+ GValue *value = NULL;
+
+ g_assert (args != NULL);
+
+ value = g_hash_table_lookup (args, "unlink-temp-file");
+ if (value) {
+ unlink_temp_file = g_value_get_boolean (value);
+ }
+
+ return unlink_temp_file;
+}
+
gboolean
ev_application_open_window (EvApplication *application,
GHashTable *args,
GdkScreen *screen,
EvLinkDest *dest,
EvWindowRunMode mode,
+ 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 need to load uri before showing the window, so
we can restore window size without flickering */
- ev_window_open_uri (new_window, uri, dest, mode);
+ 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);
{
EvLinkDest *dest = NULL;
EvWindowRunMode mode = EV_WINDOW_MODE_NORMAL;
+ gboolean unlink_temp_file = FALSE;
GdkScreen *screen = NULL;
if (args) {
screen = get_screen_from_args (args);
dest = get_destination_from_args (args);
mode = get_window_run_mode_from_args (args);
+ unlink_temp_file = (mode == EV_WINDOW_MODE_PREVIEW &&
+ get_unlink_temp_file_from_args (args));
}
ev_application_open_uri_at_dest (application, uri, screen,
- dest, mode, timestamp);
+ dest, mode, unlink_temp_file,
+ timestamp);
if (dest)
g_object_unref (dest);
for (l = uri_list; l != NULL; l = l->next) {
ev_application_open_uri_at_dest (application, (char *)l->data,
- screen, NULL, 0, timestamp);
+ screen, NULL, 0, FALSE,
+ timestamp);
}
}
{
if (application->toolbars_model) {
g_object_unref (application->toolbars_model);
+ g_object_unref (application->preview_toolbars_model);
g_free (application->toolbars_file);
application->toolbars_model = NULL;
+ application->preview_toolbars_model = NULL;
application->toolbars_file = NULL;
}
egg_toolbars_model_set_flags (ev_application->toolbars_model, 0,
EGG_TB_MODEL_NOT_REMOVABLE);
+ ev_application->preview_toolbars_model = egg_toolbars_model_new ();
+
+ egg_toolbars_model_load_toolbars (ev_application->preview_toolbars_model,
+ DATADIR"/evince-preview-toolbar.xml");
+
+ egg_toolbars_model_set_flags (ev_application->preview_toolbars_model, 0,
+ EGG_TB_MODEL_NOT_REMOVABLE);
+
#ifndef HAVE_GTK_RECENT
ev_application->recent_model = egg_recent_model_new (EGG_RECENT_MODEL_SORT_MRU);
/* FIXME we should add a mime type filter but current eggrecent
return windows;
}
-EggToolbarsModel *ev_application_get_toolbars_model (EvApplication *application)
+EggToolbarsModel *ev_application_get_toolbars_model (EvApplication *application,
+ gboolean preview)
{
- return application->toolbars_model;
+ return preview ?
+ application->preview_toolbars_model : application->toolbars_model;
}
#ifndef HAVE_GTK_RECENT
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);
+}