[gnac/devel] Code refactoring

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

commit 671ef51b7b0ee957905c0da2a70aed5a5f9acb2c
Author: BenoÃt Dupasquier <bdupasqu src gnome org>
Date:   Tue Mar 27 01:49:04 2012 +0100

    Code refactoring

 src/gnac-file-list.c  |   23 +++++++++++++----------
 src/gnac-file-list.h  |    5 ++++-
 src/gnac-main.c       |   26 +++++++++++++-------------
 src/gnac-prefs.c      |    2 +-
 src/gnac-properties.c |   20 +++++++++-----------
 src/gnac-ui.c         |    3 ++-
 6 files changed, 42 insertions(+), 37 deletions(-)
---
diff --git a/src/gnac-file-list.c b/src/gnac-file-list.c
index 9c0dbde..98a5075 100644
--- a/src/gnac-file-list.c
+++ b/src/gnac-file-list.c
@@ -149,15 +149,18 @@ gnac_file_list_new(void)
 
 
 void
-gnac_file_list_attach_default_model(gboolean attach)
+gnac_file_list_attach_default_model(void)
 {
-  if (attach) {
-    gtk_tree_view_set_model(view, model);
-    g_object_unref(model);
-  } else {
-    g_object_ref(model);
-    gtk_tree_view_set_model(view, NULL);
-  }
+  gtk_tree_view_set_model(view, model);
+  g_object_unref(model);
+}
+
+
+void
+gnac_file_list_detach_default_model(void)
+{
+  g_object_ref(model);
+  gtk_tree_view_set_model(view, NULL);
 }
 
 
@@ -251,10 +254,10 @@ gnac_file_list_remove_row(const gchar *uri)
 void
 gnac_file_list_remove_all(void)
 {
-  gnac_file_list_attach_default_model(FALSE);
+  gnac_file_list_detach_default_model();
   gtk_list_store_clear(GTK_LIST_STORE(model));
   g_hash_table_remove_all(reference_table);
-  gnac_file_list_attach_default_model(TRUE);
+  gnac_file_list_attach_default_model();
   gtk_tree_view_columns_autosize(view);
 }
 
diff --git a/src/gnac-file-list.h b/src/gnac-file-list.h
index 364e8c1..8717e1a 100644
--- a/src/gnac-file-list.h
+++ b/src/gnac-file-list.h
@@ -43,7 +43,10 @@ GtkWidget *
 gnac_file_list_new(void);
 
 void
-gnac_file_list_attach_default_model(gboolean attach);
+gnac_file_list_attach_default_model(void);
+
+void
+gnac_file_list_detach_default_model(void);
 
 void
 gnac_file_list_add_row(const gchar *uri);
diff --git a/src/gnac-main.c b/src/gnac-main.c
index 32f8649..d7040de 100644
--- a/src/gnac-main.c
+++ b/src/gnac-main.c
@@ -99,38 +99,38 @@ gnac_change_state(GnacState new_state)
       gnac_ui_on_audio_empty_state();
       prev_time_left = -1;
       gnac_utils_moving_avg_reset();
-    break;
+      break;
 
     case GNAC_AUDIO_FILE_ACTION_STATE:
       gnac_ui_on_audio_file_action_state();
-    break;
+      break;
 
     case GNAC_AUDIO_READY_STATE: 
       remember_overwrite = FALSE;
       gnac_ui_on_audio_ready_state();
       prev_time_left = -1;
       gnac_utils_moving_avg_reset();
-    break;
+      break;
 
     case GNAC_AUDIO_CONVERT_STATE:
       gnac_ui_on_audio_convert_state();
-    break;
+      break;
 
     case GNAC_AUDIO_PAUSED_STATE:
       gnac_bars_on_convert_pause();
-    break;
+      break;
 
     case GNAC_PLUGIN_INSTALL_STATE:
       gnac_bars_on_plugin_install();
-    break;
+      break;
 
     case GNAC_AUDIO_CLEAR_STATE:
-    break;
+      break;
 
     default:
-    /* does nothing */
-    break;
-  } 
+      /* nothing to do */
+      break;
+  }
 }
 
 
@@ -218,7 +218,7 @@ gnac_add_files_thread_entry(gpointer data)
   }
 
   gdk_threads_enter();
-    gnac_file_list_attach_default_model(FALSE);
+    gnac_file_list_detach_default_model();
     gnac_ui_push_status(_("Importing files..."));
   gdk_threads_leave();
 
@@ -233,7 +233,7 @@ gnac_add_files_thread_entry(gpointer data)
   if (!quit_app) {
     gdk_threads_enter();
       gnac_ui_set_progress_text("");
-      gnac_file_list_attach_default_model(TRUE);
+      gnac_file_list_attach_default_model();
       gnac_change_state(GNAC_AUDIO_READY_STATE);
       gchar *files_added_text = g_strdup_printf(
           ngettext("%u file imported", "%u files imported", nb_files_added),
@@ -445,7 +445,7 @@ gnac_on_converter_file_removed_cb(LibgnacConverter *converter,
                                   const gchar      *uri)
 {
   gnac_file_list_remove_row(uri);
-  if (!gnac_file_list_count_rows() > 0) {
+  if (gnac_file_list_count_rows() == 0) {
     gnac_change_state(GNAC_AUDIO_EMPTY_STATE);
   }
 }
diff --git a/src/gnac-prefs.c b/src/gnac-prefs.c
index 11ee79a..02323dc 100644
--- a/src/gnac-prefs.c
+++ b/src/gnac-prefs.c
@@ -561,7 +561,7 @@ gnac_prefs_query_tooltip_cb(GtkWidget  *entry,
 static void
 gnac_prefs_window_hide(void)
 {
-  if (gnac_prefs_builder) {
+  if (G_LIKELY(gnac_prefs_builder)) {
     GtkWidget *prefs_window = gnac_prefs_get_widget("gnac_preference_window");
     gtk_widget_hide(prefs_window);
   }
diff --git a/src/gnac-properties.c b/src/gnac-properties.c
index 01a73e8..381c457 100644
--- a/src/gnac-properties.c
+++ b/src/gnac-properties.c
@@ -166,8 +166,6 @@ gnac_properties_build_table(void)
   GtkTreeModel    *model;
   GtkTreeView     *view;
 
-  guint i;
-
   model = GTK_TREE_MODEL(gnac_properties_get_object("properties_store"));
   view = GTK_TREE_VIEW(gnac_properties_get_widget("properties_view"));
 
@@ -194,6 +192,7 @@ gnac_properties_build_table(void)
   gnac_properties_table = g_hash_table_new_full(g_str_hash,
       g_str_equal, g_free, (GDestroyNotify) gtk_tree_row_reference_free);
   
+  guint i;
   for (i = 0; displayed_properties[i][0]; i++) {
     GtkTreeIter iter;
 
@@ -271,8 +270,7 @@ gnac_properties_set_property(const gchar  *name,
 
   GtkTreeIter iter;
 
-  if (gtk_tree_model_get_iter(model, &iter, path))
-  {
+  if (gtk_tree_model_get_iter(model, &iter, path)) {
     gtk_list_store_set(GTK_LIST_STORE(model), &iter,
         PROPERTY_VALUE, str_value,
         PROPERTY_VISIBLE, visible,
@@ -400,13 +398,13 @@ gnac_properties_get_property_from_value(const gchar  *name,
     else return g_strdup_printf("%g", val);
   }
 
-  if (LIBGNAC_METADATA_TAG_IS_AUDIO_CODEC(name)
-      || LIBGNAC_METADATA_TAG_IS_CONTAINER(name)
-      || LIBGNAC_METADATA_TAG_IS_ENCODER(name)
-      || LIBGNAC_METADATA_TAG_IS_FILENAME(name)
-      || LIBGNAC_METADATA_TAG_IS_LOCATION(name)
-      || LIBGNAC_METADATA_TAG_IS_MODE(name)
-      || LIBGNAC_METADATA_TAG_IS_VIDEO_CODEC(name))
+  if (LIBGNAC_METADATA_TAG_IS_AUDIO_CODEC(name) ||
+      LIBGNAC_METADATA_TAG_IS_CONTAINER(name)   ||
+      LIBGNAC_METADATA_TAG_IS_ENCODER(name)     ||
+      LIBGNAC_METADATA_TAG_IS_FILENAME(name)    ||
+      LIBGNAC_METADATA_TAG_IS_LOCATION(name)    ||
+      LIBGNAC_METADATA_TAG_IS_MODE(name)        ||
+      LIBGNAC_METADATA_TAG_IS_VIDEO_CODEC(name))
   {
     const gchar *str = g_value_get_string(value);
     if (!str) return NULL;
diff --git a/src/gnac-ui.c b/src/gnac-ui.c
index 9a8c508..bcd5dbc 100644
--- a/src/gnac-ui.c
+++ b/src/gnac-ui.c
@@ -542,8 +542,9 @@ gnac_ui_new(void)
 
   gnac_profiles_init();
 
-  /* DnD portion code */
   GtkWidget *file_list = gnac_file_list_new();
+
+  /* DnD portion code */
   gtk_drag_dest_set(file_list, GTK_DEST_DEFAULT_ALL,
       target_list, n_targets, GDK_ACTION_COPY);
 }