Fixes bug #542924. Makes enums static to fix Solaris build.

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

diff --git a/shell/ev-application.c b/shell/ev-application.c
index deac0ed5529221e7b16cd665a843c985e84d9acd..7ad13820dd9d8f2de408a93d0edde90f29d9c83b 100644 (file)
--- a/shell/ev-application.c
+++ b/shell/ev-application.c
@@ -20,10 +20,14 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 

+#include <config.h>

 #include "ev-application.h"
 #include "ev-utils.h"
 #include "ev-file-helpers.h"
 #include "ev-document-factory.h"
 #include "ev-application.h"
 #include "ev-utils.h"
 #include "ev-file-helpers.h"
 #include "ev-document-factory.h"

+#ifdef ENABLE_DBUS
+#include "ev-media-player-keys.h"
+#endif /* ENABLE_DBUS */

 #include "totem-scrsaver.h"
 
 #include <glib.h>
 #include "totem-scrsaver.h"
 
 #include <glib.h>


@@ -58,12 +62,14 @@ struct _EvApplication {
 
        gchar *last_chooser_uri;
 
 
        gchar *last_chooser_uri;
 

-#ifdef WITH_GTK_PRINT
+#ifdef ENABLE_DBUS
+       EvMediaPlayerKeys *keys;
+#endif /* ENABLE_DBUS */
+

        GtkPrintSettings *print_settings;
 #if GTK_CHECK_VERSION (2, 11, 0)
        gchar            *print_settings_file;
 #endif
        GtkPrintSettings *print_settings;
 #if GTK_CHECK_VERSION (2, 11, 0)
        gchar            *print_settings_file;
 #endif

-#endif

 };
 
 struct _EvApplicationClass {
 };
 
 struct _EvApplicationClass {


@@ -322,6 +328,18 @@ get_destination_from_args (GHashTable *args)
        return dest;
 }
 
        return dest;
 }
 

+static const gchar *
+get_find_string_from_args (GHashTable *args)
+{
+       GValue *value = NULL;
+
+       g_assert (args != NULL);
+
+       value = g_hash_table_lookup (args, "find-string");
+       
+       return value ? g_value_get_string (value) : NULL;
+}
+

 /**
  * get_unlink_temp_file_from_args:
  * @args: a #GHashTable with data passed to the application.
 /**
  * get_unlink_temp_file_from_args:
  * @args: a #GHashTable with data passed to the application.


@@ -520,6 +538,7 @@ ev_application_open_uri_at_dest (EvApplication  *application,
                                 GdkScreen      *screen,
                                 EvLinkDest     *dest,
                                 EvWindowRunMode mode,
                                 GdkScreen      *screen,
                                 EvLinkDest     *dest,
                                 EvWindowRunMode mode,

+                                const gchar    *search_string,

                                 gboolean        unlink_temp_file,
                                 const gchar    *print_settings, 
                                 guint           timestamp)
                                 gboolean        unlink_temp_file,
                                 const gchar    *print_settings, 
                                 guint           timestamp)


@@ -545,7 +564,7 @@ ev_application_open_uri_at_dest (EvApplication  *application,
 
        /* We need to load uri before showing the window, so
           we can restore window size without flickering */     
 
        /* 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, search_string, 

                            unlink_temp_file, print_settings);
 
        ev_document_fc_mutex_lock ();
                            unlink_temp_file, print_settings);
 
        ev_document_fc_mutex_lock ();


@@ -573,6 +592,7 @@ ev_application_open_uri (EvApplication  *application,
 {
        EvLinkDest      *dest = NULL;
        EvWindowRunMode  mode = EV_WINDOW_MODE_NORMAL;
 {
        EvLinkDest      *dest = NULL;
        EvWindowRunMode  mode = EV_WINDOW_MODE_NORMAL;

+       const gchar     *search_string = NULL;

        gboolean         unlink_temp_file = FALSE;
        const gchar     *print_settings = NULL;
        GdkScreen       *screen = NULL;
        gboolean         unlink_temp_file = FALSE;
        const gchar     *print_settings = NULL;
        GdkScreen       *screen = NULL;


@@ -581,13 +601,15 @@ ev_application_open_uri (EvApplication  *application,
                screen = get_screen_from_args (args);
                dest = get_destination_from_args (args);
                mode = get_window_run_mode_from_args (args);
                screen = get_screen_from_args (args);
                dest = get_destination_from_args (args);
                mode = get_window_run_mode_from_args (args);

+               search_string = get_find_string_from_args (args);

                unlink_temp_file = (mode == EV_WINDOW_MODE_PREVIEW &&
                                    get_unlink_temp_file_from_args (args));
                print_settings = get_print_settings_from_args (args);
        }
        
        ev_application_open_uri_at_dest (application, uri, screen,
                unlink_temp_file = (mode == EV_WINDOW_MODE_PREVIEW &&
                                    get_unlink_temp_file_from_args (args));
                print_settings = get_print_settings_from_args (args);
        }
        
        ev_application_open_uri_at_dest (application, uri, screen,

-                                        dest, mode, unlink_temp_file,
+                                        dest, mode, search_string,
+                                        unlink_temp_file,

                                         print_settings, timestamp);
 
        if (dest)
                                         print_settings, timestamp);
 
        if (dest)


@@ -606,8 +628,8 @@ ev_application_open_uri_list (EvApplication *application,
 
        for (l = uri_list; l != NULL; l = l->next) {
                ev_application_open_uri_at_dest (application, (char *)l->data,
 
        for (l = uri_list; l != NULL; l = l->next) {
                ev_application_open_uri_at_dest (application, (char *)l->data,

-                                                screen, NULL, 0, FALSE,
-                                                NULL, timestamp);
+                                                screen, NULL, 0, NULL,
+                                                FALSE, NULL, timestamp);

        }
 }
 
        }
 }
 


@@ -621,7 +643,6 @@ ev_application_shutdown (EvApplication *application)
                application->toolbars_file = NULL;
        }
 
                application->toolbars_file = NULL;
        }
 

-#ifdef WITH_GTK_PRINT

 #if GTK_CHECK_VERSION (2, 11, 0)
        if (application->print_settings_file) {
                if (application->print_settings) {
 #if GTK_CHECK_VERSION (2, 11, 0)
        if (application->print_settings_file) {
                if (application->print_settings) {


@@ -631,7 +652,7 @@ ev_application_shutdown (EvApplication *application)
                                                    application->print_settings_file,
                                                    &error);
                        if (error) {
                                                    application->print_settings_file,
                                                    &error);
                        if (error) {

-                               g_warning (error->message);
+                               g_warning ("%s", error->message);

                                g_error_free (error);
                        }
 
                                g_error_free (error);
                        }
 


@@ -648,7 +669,6 @@ ev_application_shutdown (EvApplication *application)
                application->print_settings = NULL;
        }
 #endif /* GTK 2.11.0 */
                application->print_settings = NULL;
        }
 #endif /* GTK 2.11.0 */

-#endif /* WITH_GTK_PRINT */

        
        g_free (application->last_chooser_uri);
        g_object_unref (application);
        
        g_free (application->last_chooser_uri);
        g_object_unref (application);


@@ -702,6 +722,10 @@ ev_application_init (EvApplication *ev_application)
 
        egg_toolbars_model_set_flags (ev_application->toolbars_model, 0,
                                      EGG_TB_MODEL_NOT_REMOVABLE);
 
        egg_toolbars_model_set_flags (ev_application->toolbars_model, 0,
                                      EGG_TB_MODEL_NOT_REMOVABLE);

+
+#ifdef ENABLE_DBUS
+       ev_application->keys = ev_media_player_keys_new ();
+#endif /* ENABLE_DBUS */

 }
 
 /**
 }
 
 /**


@@ -731,6 +755,26 @@ ev_application_get_windows (EvApplication *application)
        return windows;
 }
 
        return windows;
 }
 

+/**
+ * ev_application_get_media_keys:
+ * @application: The instance of the application.
+ *
+ * It gives you access to the media player keys handler object.
+ *
+ * Returns: A #EvMediaPlayerKeys.
+ */
+GObject
+*ev_application_get_media_keys (EvApplication *application)
+{
+#ifdef ENABLE_DBUS
+       if (!application->keys)
+               return NULL;
+       return g_object_ref (G_OBJECT (application->keys));
+#else
+       return NULL;
+#endif /* ENABLE_DBUS */
+}
+

 EggToolbarsModel *
 ev_application_get_toolbars_model (EvApplication *application)
 {
 EggToolbarsModel *
 ev_application_get_toolbars_model (EvApplication *application)
 {


@@ -771,7 +815,6 @@ ev_application_screensaver_disable (EvApplication *application)
                totem_scrsaver_disable (application->scr_saver);        
 }
 
                totem_scrsaver_disable (application->scr_saver);        
 }
 

-#ifdef WITH_GTK_PRINT

 GtkPrintSettings *
 ev_application_get_print_settings (EvApplication *application)
 {
 GtkPrintSettings *
 ev_application_get_print_settings (EvApplication *application)
 {


@@ -791,7 +834,7 @@ ev_application_get_print_settings (EvApplication *application)
                        gtk_print_settings_new_from_file (application->print_settings_file, &error);
                
                if (error) {
                        gtk_print_settings_new_from_file (application->print_settings_file, &error);
                
                if (error) {

-                       g_warning (error->message);
+                       g_warning ("%s", error->message);

                        g_error_free (error);
                } else {
                        return application->print_settings;
                        g_error_free (error);
                } else {
                        return application->print_settings;


@@ -818,4 +861,4 @@ ev_application_set_print_settings (EvApplication    *application,
        
        application->print_settings = g_object_ref (settings);
 }
        
        application->print_settings = g_object_ref (settings);
 }

-#endif /* WITH_GTK_PRINT */
+