[gnac/devel] Cleaned gnac-bars.[ch]

[BenoÃt Dupasquier <bdupasqu src gnome org>]

commit b1c32103605535989f22151b3d155487f45f059e
Author: BenoÃt Dupasquier <bdupasqu src gnome org>
Date:   Fri Nov 18 21:20:56 2011 +0000

    Cleaned gnac-bars.[ch]

 src/gnac-bars.c |  128 +++++++++++++++++++++---------------------------------
 src/gnac-bars.h |   14 ++----
 2 files changed, 54 insertions(+), 88 deletions(-)
---
diff --git a/src/gnac-bars.c b/src/gnac-bars.c
index b845291..78b1362 100644
--- a/src/gnac-bars.c
+++ b/src/gnac-bars.c
@@ -32,17 +32,37 @@
 
 #include "gnac-bars.h"
 #include "gnac-main.h"
-#include "gnac-prefs.h"
-#include "gnac-properties.h"
 #include "gnac-stock-items.h"
 #include "gnac-ui.h"
 
 
 static void
-gnac_bars_update_convert_label(const gchar *label);
+gnac_bars_update_convert_label(const gchar *label)
+{
+  g_return_if_fail(label);
+
+  GtkAction *action = gnac_ui_get_action("convert_item");
+  g_object_set(G_OBJECT(action), "stock-id", label, NULL);
+
+  GtkWidget *widget = gnac_ui_get_widget("convert_button");
+  gtk_button_set_label(GTK_BUTTON(widget), label);
+}
+
 
 static void
-gnac_bars_update_pause_label(const gchar *label);
+gnac_bars_update_pause_label(const gchar *label)
+{
+  g_return_if_fail(label);
+
+  GtkAction *action = gnac_ui_get_action("pause_item");
+  g_object_set(G_OBJECT(action), "stock-id", label, NULL);
+
+  action = gnac_ui_get_action("tray_pause_item");
+  g_object_set(G_OBJECT(action), "stock-id", label, NULL);
+
+  GtkWidget *widget = gnac_ui_get_widget("pause_button");
+  gtk_button_set_label(GTK_BUTTON(widget), label);
+}
 
 
 void
@@ -102,19 +122,6 @@ gnac_bars_on_convert(void)
 
 
 void
-gnac_bars_on_convert_stop(void)
-{
-  gnac_bars_activate_file_list(TRUE);
-  gnac_bars_update_convert_label(GTK_STOCK_CONVERT);
-  gnac_ui_activate_profiles(TRUE);
-  gnac_bars_activate_add(TRUE);
-  gnac_bars_activate_clear((nb_files_total != 0));
-  gnac_bars_activate_pause(FALSE);
-  gnac_bars_activate_preferences(TRUE);
-}
-
-
-void
 gnac_bars_on_convert_pause(void)
 {
   gnac_bars_update_pause_label(GNAC_STOCK_RESUME);
@@ -131,6 +138,19 @@ gnac_bars_on_convert_resume(void)
 
 
 void
+gnac_bars_on_convert_stop(void)
+{
+  gnac_bars_activate_file_list(TRUE);
+  gnac_bars_update_convert_label(GTK_STOCK_CONVERT);
+  gnac_ui_activate_profiles(TRUE);
+  gnac_bars_activate_add(TRUE);
+  gnac_bars_activate_clear((nb_files_total != 0));
+  gnac_bars_activate_pause(FALSE);
+  gnac_bars_activate_preferences(TRUE);
+}
+
+
+void
 gnac_bars_on_plugin_install(void)
 {
   gnac_bars_activate_add(FALSE);
@@ -159,8 +179,7 @@ gnac_bars_on_plugin_installed(void)
 void
 gnac_bars_activate_add(gboolean activate)
 {
-  GtkAction *action;
-  action = gnac_ui_get_action("add_item");
+  GtkAction *action = gnac_ui_get_action("add_item");
   gtk_action_set_sensitive(action, activate);
 }
 
@@ -168,8 +187,7 @@ gnac_bars_activate_add(gboolean activate)
 void
 gnac_bars_activate_clear(gboolean activate)
 {
-  GtkAction *action;
-  action = gnac_ui_get_action("clear_item");
+  GtkAction *action = gnac_ui_get_action("clear_item");
   gtk_action_set_sensitive(action, activate);
 }
 
@@ -177,13 +195,10 @@ gnac_bars_activate_clear(gboolean activate)
 void
 gnac_bars_activate_convert(gboolean activate)
 {
-  GtkAction *action;
-  GtkWidget *widget;
-
-  action = gnac_ui_get_action("convert_item");
+  GtkAction *action = gnac_ui_get_action("convert_item");
   gtk_action_set_sensitive(action, activate);
 
-  widget = gnac_ui_get_widget("convert_button");
+  GtkWidget *widget = gnac_ui_get_widget("convert_button");
   gtk_widget_set_sensitive(widget, activate);
 }
 
@@ -191,8 +206,7 @@ gnac_bars_activate_convert(gboolean activate)
 void
 gnac_bars_activate_file_list(gboolean activate)
 {
-  GtkWidget *file_list;
-  file_list = gnac_ui_get_widget("file_list");
+  GtkWidget *file_list = gnac_ui_get_widget("file_list");
   gtk_widget_set_sensitive(file_list, activate);
 }
 
@@ -200,13 +214,10 @@ gnac_bars_activate_file_list(gboolean activate)
 void
 gnac_bars_activate_pause(gboolean activate)
 {
-  GtkAction *action;
-  GtkWidget *widget;
-  
-  action = gnac_ui_get_action("pause_item");
+  GtkAction *action = gnac_ui_get_action("pause_item");
   gtk_action_set_visible(action, activate);
 
-  widget = gnac_ui_get_widget("pause_button");
+  GtkWidget *widget = gnac_ui_get_widget("pause_button");
   gtk_widget_set_sensitive(widget, activate);
 }
 
@@ -214,8 +225,7 @@ gnac_bars_activate_pause(gboolean activate)
 void
 gnac_bars_activate_preferences(gboolean activate)
 {
-  GtkAction *action;
-  action = gnac_ui_get_action("prefs_item");
+  GtkAction *action = gnac_ui_get_action("prefs_item");
   gtk_action_set_sensitive(action, activate);
 }
 
@@ -223,60 +233,22 @@ gnac_bars_activate_preferences(gboolean activate)
 void
 gnac_bars_activate_properties(gboolean activate)
 {
-  GtkAction *action;
-  action = gnac_ui_get_action("properties_item");
+  GtkAction *action = gnac_ui_get_action("properties_item");
   gtk_action_set_sensitive(action, activate);
 }
 
 
 void
-gnac_bars_activate_remove(gboolean activate)
+gnac_bars_activate_quit(gboolean activate)
 {
-  GtkAction *action;
-  action = gnac_ui_get_action("remove_item");
+  GtkAction *action = gnac_ui_get_action("quit_item");
   gtk_action_set_sensitive(action, activate);
 }
 
 
 void
-gnac_bars_activate_quit(gboolean activate)
+gnac_bars_activate_remove(gboolean activate)
 {
-  GtkAction *action;
-  action = gnac_ui_get_action("quit_item");
+  GtkAction *action = gnac_ui_get_action("remove_item");
   gtk_action_set_sensitive(action, activate);
 }
-
-
-static void
-gnac_bars_update_convert_label(const gchar *label)
-{
-  g_return_if_fail(label);
-
-  GtkAction *action;
-  GtkWidget *widget;
-
-  action = gnac_ui_get_action("convert_item");
-  g_object_set(G_OBJECT(action), "stock-id", label, NULL);
-
-  widget = gnac_ui_get_widget("convert_button");
-  gtk_button_set_label(GTK_BUTTON(widget), label);
-}
-
-
-static void
-gnac_bars_update_pause_label(const gchar *label)
-{
-  g_return_if_fail(label);
-
-  GtkAction *action;
-  GtkWidget *widget;
-
-  action = gnac_ui_get_action("pause_item");
-  g_object_set(G_OBJECT(action), "stock-id", label, NULL);
-
-  action = gnac_ui_get_action("tray_pause_item");
-  g_object_set(G_OBJECT(action), "stock-id", label, NULL);
-
-  widget = gnac_ui_get_widget("pause_button");
-  gtk_button_set_label(GTK_BUTTON(widget), label);
-}
diff --git a/src/gnac-bars.h b/src/gnac-bars.h
index a1a117b..bdd4958 100644
--- a/src/gnac-bars.h
+++ b/src/gnac-bars.h
@@ -26,16 +26,10 @@
 #ifndef GNAC_BARS_H
 #define GNAC_BARS_H
 
-#include <gtk/gtk.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 
-void
-gnac_bars_new(GtkWidget  *window,
-              GtkWidget **menubar,
-              GtkWidget **toolbar,
-              GtkWidget **popup_menu);
-
 void 
 gnac_bars_on_row_inserted(void);
 
@@ -51,9 +45,6 @@ gnac_bars_on_add_files_finished(void);
 void 
 gnac_bars_on_convert(void);
 
-void 
-gnac_bars_on_convert_stop(void);
-
 void
 gnac_bars_on_convert_pause(void);
 
@@ -61,6 +52,9 @@ void
 gnac_bars_on_convert_resume(void);
 
 void
+gnac_bars_on_convert_stop(void);
+
+void
 gnac_bars_on_plugin_install(void);
 
 void