gnome-commander r1605 - in trunk: . doc/C src

[epiotr svn gnome org]

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

Log:
Code cleanup

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/doc/C/gnome-commander.xml
   trunk/src/gnome-cmd-data.cc
   trunk/src/gnome-cmd-main-menu.cc

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Sun Mar  2 22:34:47 2008
@@ -40,9 +40,9 @@
  * Build fixes
 
 New features:
- * Support for APE, FLAC and Vorbis metags in advanced file rename templates
- * Support for Exif makernotes metags in advanced file rename templates
- * Support for file metags in advanced file rename templates
+ * Support for APE, FLAC and Vorbis metatags in advanced file rename templates
+ * Support for Exif makernotes metatags in advanced file rename templates
+ * Support for file metatags in advanced file rename templates
  * Metadata tags in file properties dialog
  * Use the GNOME authentication manager for user's security credentials
  * Open terminal in the current directory
@@ -114,7 +114,7 @@
  * Fixed problem #377706 (selecting files with SHIFT+PGDN)
 
 New features:
- * Support for ID3 metags in advanced file rename templates
+ * Support for ID3 metatags in advanced file rename templates
  * Updated help docs
  * New or updated translations: ar, en_GB, es, fi, it, pl, sv
  * New key bindings:
@@ -136,7 +136,7 @@
 New features:
  * Support for archives (gz,bz2,zip,lha,rar,jar,7-zip,zoo,deb,rpm) via FileRoller plugin
  * New python-like indices for advanced file rename templates
- * Support for Exif and IPTC metags in advanced file rename templates
+ * Support for Exif and IPTC metatags in advanced file rename templates
  * Fast access to advrename template placeholders
  * In-place rename (SHIFT+F6)
  * Revamped application menus

Modified: trunk/doc/C/gnome-commander.xml
==============================================================================
--- trunk/doc/C/gnome-commander.xml	(original)
+++ trunk/doc/C/gnome-commander.xml	Sun Mar  2 22:34:47 2008
@@ -5895,13 +5895,13 @@
                 <para>
                     <itemizedlist>
                         <listitem>
-                            <para>Support for APE, FLAC and Vorbis metags in advanced file rename templates</para>
+                            <para>Support for APE, FLAC and Vorbis metatags in advanced file rename templates</para>
                         </listitem>
                         <listitem>
-                            <para>Support for Exif makernotes metags in advanced file rename templates</para>
+                            <para>Support for Exif makernotes metatags in advanced file rename templates</para>
                         </listitem>
                         <listitem>
-                            <para>Support for file metags in advanced file rename templates</para>
+                            <para>Support for file metatags in advanced file rename templates</para>
                         </listitem>
                         <listitem>
                             <para>Use the GNOME authentication manager for user's security credentials</para>
@@ -6088,7 +6088,7 @@
                 <para>
                     <itemizedlist>
                         <listitem>
-                            <para>Support for ID3 metags in advanced file rename templates</para>
+                            <para>Support for ID3 metatags in advanced file rename templates</para>
                         </listitem>
                         <listitem>
                             <para>Updated help docs</para>
@@ -6145,7 +6145,7 @@
                             <para>New python-like indices for advanced file rename templates</para>
                         </listitem>
                         <listitem>
-                            <para>Support for Exif and IPTC metags in advanced file rename templates</para>
+                            <para>Support for Exif and IPTC metatags in advanced file rename templates</para>
                         </listitem>
                         <listitem>
                             <para>Fast access to advrename template placeholders</para>

Modified: trunk/src/gnome-cmd-data.cc
==============================================================================
--- trunk/src/gnome-cmd-data.cc	(original)
+++ trunk/src/gnome-cmd-data.cc	Sun Mar  2 22:34:47 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: trunk/src/gnome-cmd-main-menu.cc
==============================================================================
--- trunk/src/gnome-cmd-main-menu.cc	(original)
+++ trunk/src/gnome-cmd-main-menu.cc	Sun Mar  2 22:34:47 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)