#endif
#include "totem-scrsaver.h"
+
+#ifdef WITH_SMCLIENT
#include "eggsmclient.h"
+#endif
#include "ev-application.h"
#include "ev-document-factory.h"
GObject base_instance;
gchar *dot_dir;
+ gchar *data_dir;
gchar *accel_map_file;
gchar *toolbars_file;
gchar *crashed_file;
TotemScrsaver *scr_saver;
+#ifdef WITH_SMCLIENT
EggSMClient *smclient;
+#endif
gchar *filechooser_open_uri;
gchar *filechooser_save_uri;
GKeyFile *state_file;
gchar **uri_list;
+#ifdef WITH_SMCLIENT
if (egg_sm_client_is_resumed (application->smclient)) {
state_file = egg_sm_client_get_state_file (application->smclient);
if (!state_file)
return FALSE;
- } else if (g_file_test (application->crashed_file, G_FILE_TEST_IS_REGULAR)) {
+ } else
+#endif /* WITH_SMCLIENT */
+ if (g_file_test (application->crashed_file, G_FILE_TEST_IS_REGULAR)) {
if (ev_application_run_crash_recovery_dialog (application)) {
state_file = g_key_file_new ();
g_key_file_load_from_file (state_file,
return TRUE;
}
+#ifdef WITH_SMCLIENT
+
static void
smclient_save_state_cb (EggSMClient *client,
GKeyFile *state_file,
ev_application_shutdown (application);
}
+#endif /* WITH_SMCLIENT */
+
static void
ev_application_init_session (EvApplication *application)
{
application->crashed_file = g_build_filename (application->dot_dir,
"evince-crashed", NULL);
+#ifdef WITH_SMCLIENT
application->smclient = egg_sm_client_get ();
g_signal_connect (application->smclient, "save_state",
G_CALLBACK (smclient_save_state_cb),
g_signal_connect (application->smclient, "quit",
G_CALLBACK (smclient_quit_cb),
application);
+#endif
}
/**
g_free (application->dot_dir);
application->dot_dir = NULL;
+ g_free (application->data_dir);
+ application->data_dir = NULL;
g_free (application->filechooser_open_uri);
application->filechooser_open_uri = NULL;
g_free (application->filechooser_save_uri);
{
gint i;
const gchar *home_dir;
+ gchar *toolbar_path;
ev_application->dot_dir = g_build_filename (g_get_home_dir (),
".gnome2",
if (!ev_dir_ensure_exists (ev_application->dot_dir, 0700))
exit (1);
+#ifdef G_OS_WIN32
+{
+ gchar *dir;
+
+ dir = g_win32_get_package_installation_directory_of_module (NULL);
+ ev_application->data_dir = g_build_filename (dir, "share", "evince", NULL);
+ g_free (dir);
+}
+#else
+ ev_application->data_dir = g_strdup (DATADIR);
+#endif
+
ev_application_init_session (ev_application);
home_dir = g_get_home_dir ();
ev_application->toolbars_file = g_build_filename
(ev_application->dot_dir, "evince_toolbar.xml", NULL);
+ toolbar_path = g_build_filename (ev_application->data_dir,
+ "evince-toolbar.xml", NULL);
egg_toolbars_model_load_names (ev_application->toolbars_model,
- DATADIR "/evince-toolbar.xml");
+ toolbar_path);
if (!egg_toolbars_model_load_toolbars (ev_application->toolbars_model,
ev_application->toolbars_file)) {
egg_toolbars_model_load_toolbars (ev_application->toolbars_model,
- DATADIR"/evince-toolbar.xml");
+ toolbar_path);
}
+ g_free (toolbar_path);
/* Open item doesn't exist anymore,
* convert it to OpenRecent for compatibility
{
return application->dot_dir;
}
+
+const gchar *
+ev_application_get_data_dir (EvApplication *application)
+{
+ return application->data_dir;
+}