[frogr] Removed unneeded variables for formerly used actions



commit 454ea22561f4b62da8e9f24f796b0847b08813c0
Author: Mario Sanchez Prada <msanchez gnome org>
Date:   Sat Nov 17 03:09:21 2012 +0100

    Removed unneeded variables for formerly used actions

 src/frogr-main-view.c |   60 +++++++-----------------------------------------
 1 files changed, 9 insertions(+), 51 deletions(-)
---
diff --git a/src/frogr-main-view.c b/src/frogr-main-view.c
index fda8bc7..43183af 100644
--- a/src/frogr-main-view.c
+++ b/src/frogr-main-view.c
@@ -105,15 +105,11 @@ typedef struct _FrogrMainViewPrivate {
   GtkAction *remove_pictures_action;
   GtkAction *upload_pictures_action;
   GtkAction *open_in_external_viewer_action;
-  GtkAction *auth_action;
-  GtkAction *preferences_action;
   GtkAction *add_tags_action;
   GtkAction *edit_details_action;
   GtkAction *add_to_group_action;
   GtkAction *add_to_new_set_action;
   GtkAction *add_to_set_action;
-  GtkAction *help_action;
-  GtkAction *about_action;
   GtkToggleAction *enable_tooltips_action;
   GtkToggleAction *reversed_order_action;
   GtkToggleAction *sort_as_loaded_action;
@@ -133,15 +129,14 @@ enum {
 
 static void _initialize_ui (FrogrMainView *self);
 static gboolean _maybe_show_auth_dialog_on_idle (FrogrMainView *self);
-static void _load_project_action (GSimpleAction *action, GVariant *parameter, gpointer data);
-static void _save_project_action (GSimpleAction *action, GVariant *parameter, gpointer data);
-static void _save_project_as_action (GSimpleAction *action, GVariant *parameter, gpointer data);
 static void _authorize_action (GSimpleAction *action, GVariant *parameter, gpointer data);
 static void _preferences_action (GSimpleAction *action, GVariant *parameter, gpointer data);
 static void _about_action (GSimpleAction *action, GVariant *parameter, gpointer data);
 static void _help_action (GSimpleAction *action, GVariant *parameter, gpointer data);
 static void _quit_action (GSimpleAction *action, GVariant *parameter, gpointer data);
 
+static void _quit_application (FrogrMainView *self);
+
 static void _update_project_path (FrogrMainView *self, const gchar *path);
 static void _update_window_title (FrogrMainView *self, gboolean dirty);
 
@@ -171,8 +166,6 @@ gboolean _on_icon_view_button_press_event (GtkWidget *widget,
 
 void _on_account_menu_item_toggled (GtkWidget *widget, gpointer self);
 
-static void _quit_application (FrogrMainView *self);
-
 static gboolean _on_main_view_delete_event (GtkWidget *widget,
                                             GdkEvent *event,
                                             gpointer self);
@@ -271,9 +264,6 @@ static void _update_ui (FrogrMainView *self);
 /* Private API */
 
 static GActionEntry app_entries[] = {
-  { "load_project", _load_project_action, NULL, NULL, NULL },
-  { "save_project", _save_project_action, NULL, NULL, NULL },
-  { "save_project_as", _save_project_as_action, NULL, NULL, NULL },
   { "authorize", _authorize_action, NULL, NULL, NULL },
   { "preferences", _preferences_action, NULL, NULL, NULL },
   { "help", _help_action, NULL, NULL, NULL },
@@ -389,10 +379,6 @@ _initialize_ui (FrogrMainView *self)
   priv->open_in_external_viewer_action =
     GTK_ACTION (gtk_builder_get_object (builder,
                                         "open_in_external_viewer_action"));
-  priv->auth_action =
-    GTK_ACTION (gtk_builder_get_object (builder, "auth_action"));
-  priv->preferences_action =
-    GTK_ACTION (gtk_builder_get_object (builder, "preferences_action"));
   priv->add_tags_action =
     GTK_ACTION (gtk_builder_get_object (builder, "add_tags_action"));
   priv->edit_details_action =
@@ -403,10 +389,6 @@ _initialize_ui (FrogrMainView *self)
     GTK_ACTION (gtk_builder_get_object (builder, "add_to_set_action"));
   priv->add_to_new_set_action =
     GTK_ACTION (gtk_builder_get_object (builder, "add_to_new_set_action"));
-  priv->help_action =
-    GTK_ACTION (gtk_builder_get_object (builder, "help_action"));
-  priv->about_action =
-    GTK_ACTION (gtk_builder_get_object (builder, "about_action"));
   priv->enable_tooltips_action =
     GTK_TOGGLE_ACTION (gtk_builder_get_object (builder,
                                                "enable_tooltips_action"));
@@ -573,30 +555,6 @@ _maybe_show_auth_dialog_on_idle (FrogrMainView *self)
 }
 
 static void
-_load_project_action (GSimpleAction *action,
-                      GVariant *parameter,
-                      gpointer data)
-{
-  _load_project_dialog (FROGR_MAIN_VIEW (data));
-}
-
-static void
-_save_project_action (GSimpleAction *action,
-                       GVariant *parameter,
-                       gpointer data)
-{
-  _save_current_project (FROGR_MAIN_VIEW (data));
-}
-
-static void
-_save_project_as_action (GSimpleAction *action,
-                         GVariant *parameter,
-                         gpointer data)
-{
-  _save_project_as_dialog (FROGR_MAIN_VIEW (data));
-}
-
-static void
 _authorize_action (GSimpleAction *action,
                    GVariant *parameter,
                    gpointer data)
@@ -643,6 +601,13 @@ _quit_action (GSimpleAction *action,
 }
 
 static void
+_quit_application (FrogrMainView *self)
+{
+  GtkApplication *gtk_app = gtk_window_get_application (GTK_WINDOW (self));
+  g_application_quit (G_APPLICATION (gtk_app));
+}
+
+static void
 _update_project_path (FrogrMainView *self, const gchar *path)
 {
   FrogrMainViewPrivate *priv = FROGR_MAIN_VIEW_GET_PRIVATE (self);
@@ -1127,13 +1092,6 @@ _on_account_menu_item_toggled (GtkWidget *widget, gpointer self)
     }
 }
 
-static void
-_quit_application (FrogrMainView *self)
-{
-  GtkApplication *gtk_app = gtk_window_get_application (GTK_WINDOW (self));
-  g_application_quit (G_APPLICATION (gtk_app));
-}
-
 static gboolean
 _on_main_view_delete_event (GtkWidget *widget,
                             GdkEvent *event,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]