gnome-commander r1619 - branches/gcmd-1-3/src

[epiotr svn gnome org]

Author: epiotr
Date: Wed Mar  5 21:45:32 2008
New Revision: 1619
URL: http://svn.gnome.org/viewvc/gnome-commander?rev=1619&view=rev

Log:
Code cleanup

Modified:
   branches/gcmd-1-3/src/gnome-cmd-advrename-dialog.cc
   branches/gcmd-1-3/src/gnome-cmd-main-menu.cc

Modified: branches/gcmd-1-3/src/gnome-cmd-advrename-dialog.cc
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-advrename-dialog.cc	(original)
+++ branches/gcmd-1-3/src/gnome-cmd-advrename-dialog.cc	Wed Mar  5 21:45:32 2008
@@ -101,7 +101,6 @@
                                          "$c",
                                          "$c(2)",
                                          "$x(8)",
-                                         "$X(8)",
                                          "%x",
                                          "%Y-%m-%d",
                                          "%y-%m-%d",
@@ -160,28 +159,27 @@
 
     GtkItemFactoryEntry counter_items[] = {{_("/Counter"), NULL, (GtkItemFactoryCallback) insert_text_tag, 5},
                                            {_("/Counter (precision)"), NULL, (GtkItemFactoryCallback) insert_text_tag, 6},
-                                           {_("/Hexadecimal random number (precision)"), NULL, (GtkItemFactoryCallback) insert_text_tag, 7},
-                                           {_("/Hexadecimal random number (precision)"), NULL, (GtkItemFactoryCallback) insert_text_tag, 8}};
+                                           {_("/Hexadecimal random number (precision)"), NULL, (GtkItemFactoryCallback) insert_text_tag, 7}};
 
-    GtkItemFactoryEntry date_items[] =    {{_("/Date/<locale>"), NULL, (GtkItemFactoryCallback) insert_text_tag, 9},
-                                           {_("/Date/yyyy-mm-dd"), NULL, (GtkItemFactoryCallback) insert_text_tag, 10},
-                                           {_("/Date/yy-mm-dd"), NULL, (GtkItemFactoryCallback) insert_text_tag, 11},
-                                           {_("/Date/yy.mm.dd"), NULL, (GtkItemFactoryCallback) insert_text_tag, 12},
-                                           {_("/Date/yymmdd"), NULL, (GtkItemFactoryCallback) insert_text_tag, 13},
-                                           {_("/Date/dd.mm.yy"), NULL, (GtkItemFactoryCallback) insert_text_tag, 14},
-                                           {_("/Date/mm-dd-yy"), NULL, (GtkItemFactoryCallback) insert_text_tag, 15},
-                                           {_("/Date/yyyy"), NULL, (GtkItemFactoryCallback) insert_text_tag, 16},
-                                           {_("/Date/yy"), NULL, (GtkItemFactoryCallback) insert_text_tag, 17},
-                                           {_("/Date/mm"), NULL, (GtkItemFactoryCallback) insert_text_tag, 18},
-                                           {_("/Date/mmm"), NULL, (GtkItemFactoryCallback) insert_text_tag, 19},
-                                           {_("/Date/dd"), NULL, (GtkItemFactoryCallback) insert_text_tag, 20},
-                                           {_("/Time/<locale>"), NULL, (GtkItemFactoryCallback) insert_text_tag, 21},
-                                           {_("/Time/HH.MM.SS"), NULL, (GtkItemFactoryCallback) insert_text_tag, 22},
-                                           {_("/Time/HH-MM-SS"), NULL, (GtkItemFactoryCallback) insert_text_tag, 23},
-                                           {_("/Time/HHMMSS"), NULL, (GtkItemFactoryCallback) insert_text_tag, 24},
-                                           {_("/Time/HH"), NULL, (GtkItemFactoryCallback) insert_text_tag, 25},
-                                           {_("/Time/MM"), NULL, (GtkItemFactoryCallback) insert_text_tag, 26},
-                                           {_("/Time/SS"), NULL, (GtkItemFactoryCallback) insert_text_tag, 27}};
+    GtkItemFactoryEntry date_items[] =    {{_("/Date/<locale>"), NULL, (GtkItemFactoryCallback) insert_text_tag, 8},
+                                           {_("/Date/yyyy-mm-dd"), NULL, (GtkItemFactoryCallback) insert_text_tag, 9},
+                                           {_("/Date/yy-mm-dd"), NULL, (GtkItemFactoryCallback) insert_text_tag, 10},
+                                           {_("/Date/yy.mm.dd"), NULL, (GtkItemFactoryCallback) insert_text_tag, 11},
+                                           {_("/Date/yymmdd"), NULL, (GtkItemFactoryCallback) insert_text_tag, 12},
+                                           {_("/Date/dd.mm.yy"), NULL, (GtkItemFactoryCallback) insert_text_tag, 13},
+                                           {_("/Date/mm-dd-yy"), NULL, (GtkItemFactoryCallback) insert_text_tag, 14},
+                                           {_("/Date/yyyy"), NULL, (GtkItemFactoryCallback) insert_text_tag, 15},
+                                           {_("/Date/yy"), NULL, (GtkItemFactoryCallback) insert_text_tag, 16},
+                                           {_("/Date/mm"), NULL, (GtkItemFactoryCallback) insert_text_tag, 17},
+                                           {_("/Date/mmm"), NULL, (GtkItemFactoryCallback) insert_text_tag, 18},
+                                           {_("/Date/dd"), NULL, (GtkItemFactoryCallback) insert_text_tag, 19},
+                                           {_("/Time/<locale>"), NULL, (GtkItemFactoryCallback) insert_text_tag, 20},
+                                           {_("/Time/HH.MM.SS"), NULL, (GtkItemFactoryCallback) insert_text_tag, 21},
+                                           {_("/Time/HH-MM-SS"), NULL, (GtkItemFactoryCallback) insert_text_tag, 22},
+                                           {_("/Time/HHMMSS"), NULL, (GtkItemFactoryCallback) insert_text_tag, 23},
+                                           {_("/Time/HH"), NULL, (GtkItemFactoryCallback) insert_text_tag, 24},
+                                           {_("/Time/MM"), NULL, (GtkItemFactoryCallback) insert_text_tag, 25},
+                                           {_("/Time/SS"), NULL, (GtkItemFactoryCallback) insert_text_tag, 26}};
 
     static GnomeCmdTag metatags[] = {
                                      TAG_FILE_NAME, TAG_FILE_PATH,

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	Wed Mar  5 21:45:32 2008
@@ -56,9 +56,9 @@
 typedef struct
 {
     MenuType type;          // Type of item
-    const gchar *label;           // The text to use for this menu-item
-    const gchar *shortcut;        // The shortcut for this menu-item
-    const gchar *tooltip;         // The tooltip of this menu-item
+    const gchar *label;     // The text to use for this menu-item
+    const gchar *shortcut;  // The shortcut for this menu-item
+    const gchar *tooltip;   // The tooltip of this menu-item
     gpointer moreinfo;      // For an item, toggleitem, this is a pointer to the function to call when the item is activated.
     gpointer user_data;     // Data pointer to pass to callbacks
     GnomeUIPixmapType pixmap_type;    // Type of pixmap for the item
@@ -74,8 +74,7 @@
                                      * pointer to the filename string.
                                      */
 
-    GtkWidget *widget;        /* Filled in by gnome_app_create*, you can use this
-                               to tweak the widgets once they have been created */
+    GtkWidget *widget;      // Filled in by gnome_app_create*, you can use this to tweak the widgets once they have been created
 } MenuData;
 
 #define MENUTYPE_END { \
@@ -384,12 +383,11 @@
     g_list_free (main_menu->priv->view_menuitems);
     main_menu->priv->view_menuitems = NULL;
 
-    item = add_menu_item (
-        main_menu,
-        GTK_MENU_SHELL (GTK_MENU_ITEM (main_menu->priv->view_menu)->submenu),
-        label, NULL,
-        pm, bm,
-        GTK_SIGNAL_FUNC (on_switch_orientation), main_menu);
+    item = add_menu_item (main_menu,
+                          GTK_MENU_SHELL (GTK_MENU_ITEM (main_menu->priv->view_menu)->submenu),
+                          label, NULL,
+                          pm, bm,
+                          GTK_SIGNAL_FUNC (on_switch_orientation), main_menu);
 
     g_free (label);