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

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

diff --git a/shell/ev-window.c b/shell/ev-window.c
index dd05d662d2b88ab2f871f6d8cd9c48594e8f028f..d8d48ab13e39d456c8f89202c8f2e32357503f03 100644 (file)
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -67,6 +67,10 @@
 #include "ev-image.h"
 #include "ev-message-area.h"
 #include "ev-mount-operation.h"
 #include "ev-image.h"
 #include "ev-message-area.h"
 #include "ev-mount-operation.h"

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

 
 #include <gtk/gtkprintunixdialog.h>
 
 
 #include <gtk/gtkprintunixdialog.h>
 


@@ -159,6 +163,7 @@ struct _EvWindowPrivate {
        EvLinkDest *dest;
        gboolean unlink_temp_file;
        gboolean in_reload;
        EvLinkDest *dest;
        gboolean unlink_temp_file;
        gboolean in_reload;

+       EvFileMonitor *monitor;

        
        EvDocument *document;
        EvHistory *history;
        
        EvDocument *document;
        EvHistory *history;


@@ -167,6 +172,7 @@ struct _EvWindowPrivate {
        EvWindowTitle *title;
 
        EvJob            *load_job;
        EvWindowTitle *title;
 
        EvJob            *load_job;

+       EvJob            *reload_job;

        EvJob            *thumbnail_job;
        EvJob            *save_job;
        EvJob            *print_job;
        EvJob            *thumbnail_job;
        EvJob            *save_job;
        EvJob            *print_job;


@@ -217,6 +223,9 @@ static void     ev_window_set_page_mode                 (EvWindow         *windo
                                                         EvWindowPageMode  page_mode);
 static void    ev_window_load_job_cb                   (EvJobLoad        *job,
                                                         gpointer          data);
                                                         EvWindowPageMode  page_mode);
 static void    ev_window_load_job_cb                   (EvJobLoad        *job,
                                                         gpointer          data);

+static void     ev_window_reload_document               (EvWindow         *window);
+static void     ev_window_reload_job_cb                 (EvJobLoad        *job,
+                                                        EvWindow         *window);

 static void     ev_window_set_icon_from_thumbnail       (EvJobThumbnail   *job,
                                                         EvWindow         *ev_window);
 static void     ev_window_print_job_cb                  (EvJobPrint       *job,
 static void     ev_window_set_icon_from_thumbnail       (EvJobThumbnail   *job,
                                                         EvWindow         *ev_window);
 static void     ev_window_print_job_cb                  (EvJobPrint       *job,


@@ -625,9 +634,9 @@ ev_window_set_message_area (EvWindow  *window,
 }
 
 static void
 }
 
 static void

-ev_window_error_message_response_cb (EvMessageArea *area,
-                                    gint           response_id,
-                                    EvWindow      *window)
+ev_window_message_area_response_cb (EvMessageArea *area,
+                                   gint           response_id,
+                                   EvWindow      *window)

 {
        ev_window_set_message_area (window, NULL);
 }
 {
        ev_window_set_message_area (window, NULL);
 }


@@ -648,7 +657,28 @@ ev_window_error_message (GtkWindow *window, const gchar *msg, GError *error)
        if (error)
                ev_message_area_set_secondary_text (EV_MESSAGE_AREA (area), error->message);
        g_signal_connect (area, "response",
        if (error)
                ev_message_area_set_secondary_text (EV_MESSAGE_AREA (area), error->message);
        g_signal_connect (area, "response",

-                         G_CALLBACK (ev_window_error_message_response_cb),
+                         G_CALLBACK (ev_window_message_area_response_cb),
+                         window);
+       gtk_widget_show (area);
+       ev_window_set_message_area (EV_WINDOW (window), area);
+}
+
+static void
+ev_window_warning_message (GtkWindow *window, const gchar *msg)
+{
+       GtkWidget *area;
+
+       if (EV_WINDOW (window)->priv->message_area)
+               return;
+
+       area = ev_message_area_new (GTK_MESSAGE_WARNING,
+                                   msg,
+                                   GTK_STOCK_CLOSE,
+                                   GTK_RESPONSE_CANCEL,
+                                   NULL);
+       
+       g_signal_connect (area, "response",
+                         G_CALLBACK (ev_window_message_area_response_cb),

                          window);
        gtk_widget_show (area);
        ev_window_set_message_area (EV_WINDOW (window), area);
                          window);
        gtk_widget_show (area);
        ev_window_set_message_area (EV_WINDOW (window), area);


@@ -1079,7 +1109,8 @@ ev_window_refresh_window_thumbnail (EvWindow *ev_window, int rotation)
        gdouble scale;
        EvDocument *document = ev_window->priv->document;
        
        gdouble scale;
        EvDocument *document = ev_window->priv->document;
        

-       if (!EV_IS_DOCUMENT_THUMBNAILS (document)) {
+       if (!EV_IS_DOCUMENT_THUMBNAILS (document) ||
+           ev_page_cache_get_n_pages (ev_window->priv->page_cache) <= 0) {

                return;
        }
        
                return;
        }
        


@@ -1164,11 +1195,21 @@ ev_window_set_document (EvWindow *ev_window, EvDocument *document)
 
        if (ev_page_cache_get_n_pages (ev_window->priv->page_cache) > 0) {
                ev_view_set_document (view, document);
 
        if (ev_page_cache_get_n_pages (ev_window->priv->page_cache) > 0) {
                ev_view_set_document (view, document);

+       } else {
+               ev_window_warning_message (GTK_WINDOW (ev_window),
+                                          _("The document contains no pages"));

        }
 
        g_idle_add ((GSourceFunc)ev_window_setup_document, ev_window);
 }
 
        }
 
        g_idle_add ((GSourceFunc)ev_window_setup_document, ev_window);
 }
 

+static void
+ev_window_document_changed (EvWindow *ev_window,
+                           gpointer  user_data)
+{
+       ev_window_reload_document (ev_window);
+}
+

 static void
 password_dialog_response (GtkWidget *password_dialog,
                          gint       response_id,
 static void
 password_dialog_response (GtkWidget *password_dialog,
                          gint       response_id,


@@ -1246,6 +1287,20 @@ ev_window_clear_load_job (EvWindow *ev_window)
        }
 }
 
        }
 }
 

+static void
+ev_window_clear_reload_job (EvWindow *ev_window)
+{
+       if (ev_window->priv->reload_job != NULL) {
+               
+               if (!ev_window->priv->reload_job->finished)
+                       ev_job_queue_remove_job (ev_window->priv->reload_job);
+               
+               g_signal_handlers_disconnect_by_func (ev_window->priv->reload_job, ev_window_reload_job_cb, ev_window);
+               g_object_unref (ev_window->priv->reload_job);
+               ev_window->priv->reload_job = NULL;
+       }
+}
+

 static void
 ev_window_clear_local_uri (EvWindow *ev_window)
 {
 static void
 ev_window_clear_local_uri (EvWindow *ev_window)
 {


@@ -1301,7 +1356,7 @@ ev_window_load_job_cb  (EvJobLoad *job,
        EvDocument *document = EV_JOB (job)->document;
 
        g_assert (job->uri);
        EvDocument *document = EV_JOB (job)->document;
 
        g_assert (job->uri);

-       
+

        ev_view_set_loading (EV_VIEW (ev_window->priv->view), FALSE);
 
        /* Success! */
        ev_view_set_loading (EV_VIEW (ev_window->priv->view), FALSE);
 
        /* Success! */


@@ -1340,23 +1395,19 @@ ev_window_load_job_cb  (EvJobLoad *job,
                                break;
                }
 
                                break;
                }
 

-               /* Restart the search after reloading */
-               if (ev_window->priv->in_reload) {
-                       GtkWidget *widget;
-                       
-                       widget = gtk_window_get_focus (GTK_WINDOW (ev_window));
-                       if (widget && gtk_widget_get_ancestor (widget, EGG_TYPE_FIND_BAR)) {
-                               find_bar_search_changed_cb (EGG_FIND_BAR (ev_window->priv->find_bar),
-                                                           NULL, ev_window);
-                       }
-               } else if (job->search_string && EV_IS_DOCUMENT_FIND (document)) {
+               if (job->search_string && EV_IS_DOCUMENT_FIND (document)) {

                        ev_window_cmd_edit_find (NULL, ev_window);
                        egg_find_bar_set_search_string (EGG_FIND_BAR (ev_window->priv->find_bar),
                                                        job->search_string);
                }
 
                        ev_window_cmd_edit_find (NULL, ev_window);
                        egg_find_bar_set_search_string (EGG_FIND_BAR (ev_window->priv->find_bar),
                                                        job->search_string);
                }
 

+               /* Create a monitor for the document */
+               ev_window->priv->monitor = ev_file_monitor_new (job->uri);
+               g_signal_connect_swapped (G_OBJECT (ev_window->priv->monitor), "changed",
+                                         G_CALLBACK (ev_window_document_changed),
+                                         ev_window);
+               

                ev_window_clear_load_job (ev_window);
                ev_window_clear_load_job (ev_window);

-               ev_window->priv->in_reload = FALSE;

                return;
        }
 
                return;
        }
 


@@ -1381,10 +1432,32 @@ ev_window_load_job_cb  (EvJobLoad *job,
                                         _("Unable to open document"),
                                         job->error);
                ev_window_clear_load_job (ev_window);
                                         _("Unable to open document"),
                                         job->error);
                ev_window_clear_load_job (ev_window);

-               ev_window->priv->in_reload = FALSE;

        }       
        }       

+}

 
 

-       return;
+static void
+ev_window_reload_job_cb (EvJobLoad *job,
+                        EvWindow  *ev_window)
+{
+       GtkWidget *widget;
+       
+       if (job->error) {
+               ev_window_clear_reload_job (ev_window);
+               ev_window->priv->in_reload = FALSE;
+               return;
+       }
+
+       ev_window_set_document (ev_window, EV_JOB (job)->document);
+
+       /* Restart the search after reloading */
+       widget = gtk_window_get_focus (GTK_WINDOW (ev_window));
+       if (widget && gtk_widget_get_ancestor (widget, EGG_TYPE_FIND_BAR)) {
+               find_bar_search_changed_cb (EGG_FIND_BAR (ev_window->priv->find_bar),
+                                           NULL, ev_window);
+       }
+
+       ev_window_clear_reload_job (ev_window);
+       ev_window->priv->in_reload = FALSE;

 }
 
 /**
 }
 
 /**


@@ -1533,9 +1606,17 @@ ev_window_open_uri (EvWindow       *ev_window,
 {
        GFile *source_file;
 
 {
        GFile *source_file;
 

+       ev_window->priv->in_reload = FALSE;
+       

        if (ev_window->priv->uri &&
            g_ascii_strcasecmp (ev_window->priv->uri, uri) == 0) {
        if (ev_window->priv->uri &&
            g_ascii_strcasecmp (ev_window->priv->uri, uri) == 0) {

-               ev_window->priv->in_reload = TRUE;
+               ev_window_reload_document (ev_window);
+               return;
+       }
+
+       if (ev_window->priv->monitor) {
+               g_object_unref (ev_window->priv->monitor);
+               ev_window->priv->monitor = NULL;

        }
        
        ev_window_close_dialogs (ev_window);
        }
        
        ev_window_close_dialogs (ev_window);


@@ -1572,6 +1653,22 @@ ev_window_open_uri (EvWindow       *ev_window,
        }
 }
 
        }
 }
 

+static void
+ev_window_reload_document (EvWindow *ev_window)
+{
+       const gchar *uri;
+
+       ev_window_clear_reload_job (ev_window);
+       ev_window->priv->in_reload = TRUE;
+       
+       uri = ev_window->priv->local_uri ? ev_window->priv->local_uri : ev_window->priv->uri;
+       ev_window->priv->reload_job = ev_job_load_new (uri, NULL, 0, NULL);
+       g_signal_connect (ev_window->priv->reload_job, "finished",
+                         G_CALLBACK (ev_window_reload_job_cb),
+                         ev_window);
+       ev_job_queue_add_job (ev_window->priv->reload_job, EV_JOB_PRIORITY_LOW);
+}
+

 static void
 file_open_dialog_response_cb (GtkWidget *chooser,
                              gint       response_id,
 static void
 file_open_dialog_response_cb (GtkWidget *chooser,
                              gint       response_id,


@@ -1941,7 +2038,7 @@ window_save_file_copy_ready_cb (GFile        *src,
                                         _("The file could not be saved as “%s”."),
                                         name);
        gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
                                         _("The file could not be saved as “%s”."),
                                         name);
        gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),

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

        g_signal_connect (dialog, "response",
                          G_CALLBACK (gtk_widget_destroy),
                          NULL);
        g_signal_connect (dialog, "response",
                          G_CALLBACK (gtk_widget_destroy),
                          NULL);


@@ -2156,7 +2253,7 @@ ev_window_print_finished (GtkPrintJob *print_job,
                                                 GTK_BUTTONS_OK,
                                                 _("Failed to print document"));
                gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
                                                 GTK_BUTTONS_OK,
                                                 _("Failed to print document"));
                gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),

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

 
                gtk_dialog_run (GTK_DIALOG (dialog));
                gtk_widget_destroy (dialog);
 
                gtk_dialog_run (GTK_DIALOG (dialog));
                gtk_widget_destroy (dialog);


@@ -2228,7 +2325,7 @@ ev_window_print_send (EvWindow    *window,
                GtkPrintJob *job;
                GError      *error = NULL;
        
                GtkPrintJob *job;
                GError      *error = NULL;
        

-               job = gtk_print_job_new ("evince-print",
+               job = gtk_print_job_new (gtk_window_get_title (GTK_WINDOW (window)),

                                         window->priv->printer,
                                         settings,
                                         window->priv->print_page_setup);
                                         window->priv->printer,
                                         settings,
                                         window->priv->print_page_setup);


@@ -2243,7 +2340,7 @@ ev_window_print_send (EvWindow    *window,
                                            window, NULL);
                } else {
                        ev_window_clear_print_job (window);
                                            window, NULL);
                } else {
                        ev_window_clear_print_job (window);

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

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


@@ -2256,7 +2353,7 @@ ev_window_print_job_cb (EvJobPrint *job,
                        EvWindow   *window)
 {
        if (job->error) {
                        EvWindow   *window)
 {
        if (job->error) {

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

                ev_window_clear_print_job (window);
                return;
        }
                ev_window_clear_print_job (window);
                return;
        }


@@ -3137,6 +3234,12 @@ ev_window_cmd_go_previous_page (GtkAction *action, EvWindow *ev_window)
        ev_view_previous_page (EV_VIEW (ev_window->priv->view));
 }
 
        ev_view_previous_page (EV_VIEW (ev_window->priv->view));
 }
 

+void
+ev_window_go_previous_page (EvWindow *ev_window)
+{
+       ev_window_cmd_go_previous_page (NULL, ev_window);
+}
+

 static void
 ev_window_cmd_go_next_page (GtkAction *action, EvWindow *ev_window)
 {
 static void
 ev_window_cmd_go_next_page (GtkAction *action, EvWindow *ev_window)
 {


@@ -3145,6 +3248,12 @@ ev_window_cmd_go_next_page (GtkAction *action, EvWindow *ev_window)
        ev_view_next_page (EV_VIEW (ev_window->priv->view));
 }
 
        ev_view_next_page (EV_VIEW (ev_window->priv->view));
 }
 

+void
+ev_window_go_next_page (EvWindow *ev_window)
+{
+       ev_window_cmd_go_next_page (NULL, ev_window);
+}
+

 static void
 ev_window_cmd_go_first_page (GtkAction *action, EvWindow *ev_window)
 {
 static void
 ev_window_cmd_go_first_page (GtkAction *action, EvWindow *ev_window)
 {


@@ -3153,6 +3262,12 @@ ev_window_cmd_go_first_page (GtkAction *action, EvWindow *ev_window)
        ev_page_cache_set_current_page (ev_window->priv->page_cache, 0);
 }
 
        ev_page_cache_set_current_page (ev_window->priv->page_cache, 0);
 }
 

+void
+ev_window_go_first_page (EvWindow *ev_window)
+{
+       ev_window_cmd_go_first_page (NULL, ev_window);
+}
+

 static void
 ev_window_cmd_go_last_page (GtkAction *action, EvWindow *ev_window)
 {
 static void
 ev_window_cmd_go_last_page (GtkAction *action, EvWindow *ev_window)
 {


@@ -3164,6 +3279,12 @@ ev_window_cmd_go_last_page (GtkAction *action, EvWindow *ev_window)
        ev_page_cache_set_current_page (ev_window->priv->page_cache, n_pages - 1);
 }
 
        ev_page_cache_set_current_page (ev_window->priv->page_cache, n_pages - 1);
 }
 

+void
+ev_window_go_last_page (EvWindow *ev_window)
+{
+       ev_window_cmd_go_last_page (NULL, ev_window);
+}
+

 static void
 ev_window_cmd_go_forward (GtkAction *action, EvWindow *ev_window)
 {
 static void
 ev_window_cmd_go_forward (GtkAction *action, EvWindow *ev_window)
 {


@@ -3194,11 +3315,7 @@ ev_window_cmd_go_backward (GtkAction *action, EvWindow *ev_window)
 static void
 ev_window_cmd_view_reload (GtkAction *action, EvWindow *ev_window)
 {
 static void
 ev_window_cmd_view_reload (GtkAction *action, EvWindow *ev_window)
 {

-       gchar *uri;
-
-       uri = g_strdup (ev_window->priv->uri);
-       ev_window_open_uri (ev_window, uri, NULL, 0, NULL, FALSE, NULL);
-       g_free (uri);
+       ev_window_reload_document (ev_window);

 }
 
 static void
 }
 
 static void


@@ -3250,7 +3367,7 @@ ev_window_cmd_help_contents (GtkAction *action, EvWindow *ev_window)
        screen = gtk_widget_get_screen (GTK_WIDGET (ev_window));
        gdk_spawn_command_line_on_screen (screen, command, &error);
        if (error != NULL) {
        screen = gtk_widget_get_screen (GTK_WIDGET (ev_window));
        gdk_spawn_command_line_on_screen (screen, command, &error);
        if (error != NULL) {

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

                g_error_free (error);
        }
        g_free (command);
                g_error_free (error);
        }
        g_free (command);


@@ -3268,6 +3385,12 @@ ev_window_cmd_start_presentation (GtkAction *action, EvWindow *window)
        ev_window_run_presentation (window);
 }
 
        ev_window_run_presentation (window);
 }
 

+void
+ev_window_start_presentation (EvWindow *ev_window)
+{
+       ev_window_run_presentation (ev_window);
+}
+

 static gboolean
 ev_window_enumerate_printer_cb (GtkPrinter *printer,
                                EvWindow   *window)
 static gboolean
 ev_window_enumerate_printer_cb (GtkPrinter *printer,
                                EvWindow   *window)


@@ -3306,7 +3429,7 @@ ev_window_preview_print_finished (GtkPrintJob *print_job,
                                                 GTK_BUTTONS_OK,
                                                 _("Failed to print document"));
                gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
                                                 GTK_BUTTONS_OK,
                                                 _("Failed to print document"));
                gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),

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

 
                gtk_dialog_run (GTK_DIALOG (dialog));
                gtk_widget_destroy (dialog);
 
                gtk_dialog_run (GTK_DIALOG (dialog));
                gtk_widget_destroy (dialog);


@@ -3330,7 +3453,7 @@ ev_window_do_preview_print (EvWindow *window)
 
        page_setup = gtk_page_setup_new ();
 
 
        page_setup = gtk_page_setup_new ();
 

-       job = gtk_print_job_new ("evince-print",
+       job = gtk_print_job_new (gtk_window_get_title (GTK_WINDOW (window)),

                                 priv->printer,
                                 priv->print_settings,
                                 page_setup);
                                 priv->printer,
                                 priv->print_settings,
                                 page_setup);


@@ -3350,7 +3473,7 @@ ev_window_do_preview_print (EvWindow *window)
                                    (GtkPrintJobCompleteFunc)ev_window_preview_print_finished,
                                    window, NULL);
        } else {
                                    (GtkPrintJobCompleteFunc)ev_window_preview_print_finished,
                                    window, NULL);
        } else {

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

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


@@ -3375,7 +3498,7 @@ ev_window_cmd_preview_print (GtkAction *action, EvWindow *window)
                                                                           &error);
                        
                        if (error) {
                                                                           &error);
                        
                        if (error) {

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

                                g_error_free (error);
                                print_settings = NULL;
                        }
                                g_error_free (error);
                                print_settings = NULL;
                        }


@@ -4011,7 +4134,21 @@ ev_window_dispose (GObject *object)
 {
        EvWindow *window = EV_WINDOW (object);
        EvWindowPrivate *priv = window->priv;
 {
        EvWindow *window = EV_WINDOW (object);
        EvWindowPrivate *priv = window->priv;

+#ifdef ENABLE_DBUS
+       GObject *keys;

 
 

+       keys = ev_application_get_media_keys (EV_APP);
+       if (keys) {
+               ev_media_player_keys_focused (EV_MEDIA_PLAYER_KEYS (keys), NULL);
+               g_object_unref (keys);
+       }
+#endif /* ENABLE_DBUS */
+
+       if (priv->monitor) {
+               g_object_unref (priv->monitor);
+               priv->monitor = NULL;
+       }
+       

        if (priv->title) {
                ev_window_title_free (priv->title);
                priv->title = NULL;
        if (priv->title) {
                ev_window_title_free (priv->title);
                priv->title = NULL;


@@ -4075,6 +4212,10 @@ ev_window_dispose (GObject *object)
                ev_window_clear_load_job (window);
        }
 
                ev_window_clear_load_job (window);
        }
 

+       if (priv->reload_job) {
+               ev_window_clear_reload_job (window);
+       }
+

        if (priv->save_job) {
                ev_window_clear_save_job (window);
        }
        if (priv->save_job) {
                ev_window_clear_save_job (window);
        }


@@ -4193,7 +4334,7 @@ static const GtkActionEntry entries[] = {
        { "FileOpen", GTK_STOCK_OPEN, N_("_Open..."), "<control>O",
          N_("Open an existing document"),
          G_CALLBACK (ev_window_cmd_file_open) },
        { "FileOpen", GTK_STOCK_OPEN, N_("_Open..."), "<control>O",
          N_("Open an existing document"),
          G_CALLBACK (ev_window_cmd_file_open) },

-       { "FileOpenCopy", NULL, N_("Op_en a Copy"), NULL,
+       { "FileOpenCopy", NULL, N_("Op_en a Copy"), "<control>N",

          N_("Open a copy of the current document in a new window"),
          G_CALLBACK (ev_window_cmd_file_open_copy) },
                { "FileSaveAs", GTK_STOCK_SAVE_AS, N_("_Save a Copy..."), "<control>S",
          N_("Open a copy of the current document in a new window"),
          G_CALLBACK (ev_window_cmd_file_open_copy) },
                { "FileSaveAs", GTK_STOCK_SAVE_AS, N_("_Save a Copy..."), "<control>S",


@@ -4224,9 +4365,9 @@ static const GtkActionEntry entries[] = {
          G_CALLBACK (ev_window_cmd_edit_find_previous) },
         { "EditToolbar", NULL, N_("T_oolbar"), NULL, NULL,
           G_CALLBACK (ev_window_cmd_edit_toolbar) },
          G_CALLBACK (ev_window_cmd_edit_find_previous) },
         { "EditToolbar", NULL, N_("T_oolbar"), NULL, NULL,
           G_CALLBACK (ev_window_cmd_edit_toolbar) },

-       { "EditRotateLeft", EV_STOCK_ROTATE_LEFT, N_("Rotate _Left"), NULL, NULL,
+       { "EditRotateLeft", EV_STOCK_ROTATE_LEFT, N_("Rotate _Left"), "<alt>Left", NULL,

          G_CALLBACK (ev_window_cmd_edit_rotate_left) },
          G_CALLBACK (ev_window_cmd_edit_rotate_left) },

-       { "EditRotateRight", EV_STOCK_ROTATE_RIGHT, N_("Rotate _Right"), NULL, NULL,
+       { "EditRotateRight", EV_STOCK_ROTATE_RIGHT, N_("Rotate _Right"), "<alt>Right", NULL,

          G_CALLBACK (ev_window_cmd_edit_rotate_right) },
 
         /* View menu */
          G_CALLBACK (ev_window_cmd_edit_rotate_right) },
 
         /* View menu */


@@ -4525,6 +4666,16 @@ sidebar_widget_model_set (EvSidebarLinks *ev_sidebar_links,
 static gboolean
 view_actions_focus_in_cb (GtkWidget *widget, GdkEventFocus *event, EvWindow *window)
 {
 static gboolean
 view_actions_focus_in_cb (GtkWidget *widget, GdkEventFocus *event, EvWindow *window)
 {

+#ifdef ENABLE_DBUS
+       GObject *keys;
+
+       keys = ev_application_get_media_keys (EV_APP);
+       if (keys) {
+               ev_media_player_keys_focused (EV_MEDIA_PLAYER_KEYS (keys), window);
+               g_object_unref (keys);
+       }
+#endif /* ENABLE_DBUS */
+

        update_chrome_flag (window, EV_CHROME_RAISE_TOOLBAR, FALSE);
        ev_window_set_action_sensitive (window, "ViewToolbar", TRUE);
 
        update_chrome_flag (window, EV_CHROME_RAISE_TOOLBAR, FALSE);
        ev_window_set_action_sensitive (window, "ViewToolbar", TRUE);