gnome-commander r1606 - in branches/gcmd-1-3: . src

[epiotr svn gnome org]

Author: epiotr
Date: Sun Mar  2 22:35:05 2008
New Revision: 1606
URL: http://svn.gnome.org/viewvc/gnome-commander?rev=1606&view=rev

Log:
Code cleanup

Modified:
   branches/gcmd-1-3/ChangeLog
   branches/gcmd-1-3/src/gnome-cmd-data.cc
   branches/gcmd-1-3/src/gnome-cmd-main-menu.cc

Modified: branches/gcmd-1-3/src/gnome-cmd-data.cc
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-data.cc	(original)
+++ branches/gcmd-1-3/src/gnome-cmd-data.cc	Sun Mar  2 22:35:05 2008
@@ -104,7 +104,7 @@
     GdkWindowState       main_win_state;
     gchar                *symlink_prefix;
 
-    GnomeCmdConFtp      *quick_connect;
+    GnomeCmdConFtp       *quick_connect;
 
     gboolean             use_gnome_auth_manager;
     gchar                *ftp_anonymous_password;

Modified: branches/gcmd-1-3/src/gnome-cmd-main-menu.cc
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-main-menu.cc	(original)
+++ branches/gcmd-1-3/src/gnome-cmd-main-menu.cc	Sun Mar  2 22:35:05 2008
@@ -210,7 +210,6 @@
             return NULL;
     }
 
-
     gtk_widget_show (item);
 
     if (spec->type == MENU_TYPE_ITEM)
@@ -229,20 +228,18 @@
 
 static GtkWidget *create_menu (GnomeCmdMainMenu *main_menu, MenuData *spec, MenuData *childs)
 {
-    gint i=0;
-    GtkWidget *submenu, *menu_item;
+    GtkWidget *submenu = gtk_menu_new ();
+    GtkWidget *menu_item = create_menu_item (main_menu, NULL, spec);
 
-    submenu = gtk_menu_new ();
-    menu_item = create_menu_item (main_menu, NULL, spec);
     gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item), submenu);
 
     gtk_widget_ref (menu_item);
     gtk_widget_show (menu_item);
 
-    while (childs[i].type != MENU_TYPE_END) {
+    for (gint i=0; childs[i].type != MENU_TYPE_END; ++i)
+    {
         GtkWidget *child = create_menu_item (main_menu, GTK_MENU (submenu), &childs[i]);
         gtk_menu_shell_append (GTK_MENU_SHELL (submenu), child);
-        i++;
     }
 
     return menu_item;
@@ -259,11 +256,11 @@
                GtkSignalFunc callback,
                gpointer user_data)
 {
+    g_return_val_if_fail (GTK_IS_MENU_SHELL (menu), NULL);
+
     GtkWidget *item, *label;
     GtkWidget *pixmap_widget = NULL;
 
-    g_return_val_if_fail (GTK_IS_MENU_SHELL (menu), NULL);
-
     item = gtk_image_menu_item_new ();
 
     if (tooltip)