[evince/wip/recent-view] shell: Rename ev-minimal-toolbar to ev-recent-view-toolbar

[Germán Poó Caamaño <gpoo src gnome org>]

commit 422ce9667b31e9416e767b4515966a1bdee0a61e
Author: Germán Poo-Caamaño <gpoo gnome org>
Date:   Sun May 4 01:03:00 2014 -0700

    shell: Rename ev-minimal-toolbar to ev-recent-view-toolbar

 shell/ev-window.c |   43 +++++++++++++++++++++----------------------
 shell/ev-window.h |    2 +-
 2 files changed, 22 insertions(+), 23 deletions(-)
---
diff --git a/shell/ev-window.c b/shell/ev-window.c
index 259f0be..007b69f 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -51,7 +51,6 @@
 #include "ev-document-images.h"
 #include "ev-document-links.h"
 #include "ev-document-annotations.h"
-#include "ev-document-type-builtins.h"
 #include "ev-document-misc.h"
 #include "ev-file-exporter.h"
 #include "ev-file-helpers.h"
@@ -91,7 +90,7 @@
 #include "ev-zoom-action.h"
 #include "ev-toolbar.h"
 #include "ev-recent-view.h"
-#include "ev-minimal-toolbar.h"
+#include "ev-recent-view-toolbar.h"
 
 #ifdef ENABLE_DBUS
 #include "ev-gdbus-generated.h"
@@ -172,7 +171,7 @@ struct _EvWindowPrivate {
 
        /* UI Builders */
        GtkActionGroup   *action_group;
-       GtkActionGroup   *minimal_toolbar_action_group;
+       GtkActionGroup   *recent_view_toolbar_action_group;
        GtkActionGroup   *view_popup_action_group;
        GtkActionGroup   *attachment_popup_action_group;
        GtkActionGroup   *zoom_selector_popup_action_group;
@@ -193,7 +192,7 @@ struct _EvWindowPrivate {
 
        /* For bookshelf view of recent items*/
        EvRecentView *recent_view;
-       GtkWidget *minimal_toolbar;
+       GtkWidget *recent_view_toolbar;
        
        /* Document */
        EvDocumentModel *model;
@@ -5184,7 +5183,7 @@ ev_window_try_swap_out_recent_view (EvWindow *ev_window)
        if (ev_window->priv->recent_view)
        {
                gtk_widget_hide (GTK_WIDGET (ev_window->priv->recent_view));
-               gtk_widget_hide (GTK_WIDGET (ev_window->priv->minimal_toolbar));
+               gtk_widget_hide (GTK_WIDGET (ev_window->priv->recent_view_toolbar));
                g_object_unref (ev_window->priv->recent_view);
                ev_window->priv->recent_view = NULL;
        }
@@ -5660,9 +5659,9 @@ ev_window_dispose (GObject *object)
                priv->action_group = NULL;
        }
 
-       if (priv->minimal_toolbar_action_group) {
-               g_object_unref (priv->minimal_toolbar_action_group);
-               priv->minimal_toolbar_action_group = NULL;
+       if (priv->recent_view_toolbar_action_group) {
+               g_object_unref (priv->recent_view_toolbar_action_group);
+               priv->recent_view_toolbar_action_group = NULL;
        }
        if (priv->view_popup_action_group) {
                g_object_unref (priv->view_popup_action_group);
@@ -6091,8 +6090,8 @@ static const GtkToggleActionEntry zoom_selector_popup_actions[] = {
          G_CALLBACK (ev_window_cmd_view_zoom_automatic) }
 };
 
-/* Items for the minimal toolbar */
-static const GtkActionEntry minimal_toolbar_entries [] = {
+/* Items for the recent view toolbar */
+static const GtkActionEntry recent_view_toolbar_entries [] = {
        { "RecentViewHide", "view-grid-symbolic", N_("Recent Documents"), NULL,
          N_("Hide recent documents"),
          G_CALLBACK (ev_window_cmd_hide_recent_view) },
@@ -7253,11 +7252,11 @@ ev_window_init (EvWindow *ev_window)
                gtk_ui_manager_get_accel_group (ev_window->priv->ui_manager);
        gtk_window_add_accel_group (GTK_WINDOW (ev_window), accel_group);
 
-       action_group = gtk_action_group_new ("MinimalToolbarActions");
-       ev_window->priv->minimal_toolbar_action_group = action_group;
+       action_group = gtk_action_group_new ("RecentViewToolbarActions");
+       ev_window->priv->recent_view_toolbar_action_group = action_group;
        gtk_action_group_set_translation_domain (action_group, NULL);
-       gtk_action_group_add_actions (action_group, minimal_toolbar_entries,
-                                     G_N_ELEMENTS (minimal_toolbar_entries), ev_window);
+       gtk_action_group_add_actions (action_group, recent_view_toolbar_entries,
+                                     G_N_ELEMENTS (recent_view_toolbar_entries), ev_window);
 
        action_group = gtk_action_group_new ("ViewPopupActions");
        ev_window->priv->view_popup_action_group = action_group;
@@ -7322,11 +7321,11 @@ ev_window_init (EvWindow *ev_window)
                            ev_window->priv->find_bar,
                            FALSE, TRUE, 0);
        
-       ev_window->priv->minimal_toolbar = ev_minimal_toolbar_new (ev_window);
-       gtk_widget_set_halign (ev_window->priv->minimal_toolbar, GTK_ALIGN_FILL);
-       gtk_widget_set_valign (ev_window->priv->minimal_toolbar, GTK_ALIGN_START);
+       ev_window->priv->recent_view_toolbar = ev_recent_view_toolbar_new (ev_window);
+       gtk_widget_set_halign (ev_window->priv->recent_view_toolbar, GTK_ALIGN_FILL);
+       gtk_widget_set_valign (ev_window->priv->recent_view_toolbar, GTK_ALIGN_START);
        gtk_box_pack_start (GTK_BOX (ev_window->priv->main_box),
-                           ev_window->priv->minimal_toolbar,
+                           ev_window->priv->recent_view_toolbar,
                            FALSE, TRUE, 0);
 
        /* Add the main area */
@@ -7657,7 +7656,7 @@ ev_window_new (void)
 void
 ev_window_show_recent_view (EvWindow *ev_window)
 {
-       GtkAction *action = gtk_action_group_get_action (ev_window->priv->minimal_toolbar_action_group,
+       GtkAction *action = gtk_action_group_get_action (ev_window->priv->recent_view_toolbar_action_group,
                                                         "RecentViewHide");
        gtk_widget_hide (ev_window->priv->hpaned);
        gtk_widget_hide (ev_window->priv->toolbar);
@@ -7675,7 +7674,7 @@ ev_window_show_recent_view (EvWindow *ev_window)
        }
 
        gtk_action_set_sensitive (action, ev_window->priv->document != NULL);
-       gtk_widget_show (ev_window->priv->minimal_toolbar);
+       gtk_widget_show (ev_window->priv->recent_view_toolbar);
        gtk_widget_show (GTK_WIDGET (ev_window->priv->recent_view));
        ev_window_setup_action_sensitivity (ev_window);
 
@@ -7717,9 +7716,9 @@ ev_window_get_zoom_selector_action_group (EvWindow *ev_window)
 }
 
 GtkActionGroup *
-ev_window_get_minimal_toolbar_action_group (EvWindow *ev_window)
+ev_window_get_recent_view_toolbar_action_group (EvWindow *ev_window)
 {
        g_return_val_if_fail (EV_WINDOW (ev_window), NULL);
 
-       return ev_window->priv->minimal_toolbar_action_group;
+       return ev_window->priv->recent_view_toolbar_action_group;
 }
diff --git a/shell/ev-window.h b/shell/ev-window.h
index 1876b30..27adcfa 100644
--- a/shell/ev-window.h
+++ b/shell/ev-window.h
@@ -90,7 +90,7 @@ GtkUIManager   *ev_window_get_ui_manager                 (EvWindow       *ev_win
 GtkActionGroup *ev_window_get_main_action_group          (EvWindow       *ev_window);
 GtkActionGroup *ev_window_get_zoom_selector_action_group (EvWindow       *ev_window);
 void            ev_window_show_recent_view               (EvWindow       *ev_window);
-GtkActionGroup *ev_window_get_minimal_toolbar_action_group (EvWindow     *ev_window);
+GtkActionGroup *ev_window_get_recent_view_toolbar_action_group (EvWindow     *ev_window);
 
 G_END_DECLS