GNOME.org
 

[gnome-commander] This reverts commit cd4f3b7a871d7576aa052cd90faeb186da154cb5

commit 7bf7f97035e0dc55c5bcf01391fff5ca15150fe0
Author: Piotr Eljasiak <epiotr src gnome org>
Date:   Thu Jun 4 00:22:40 2009 +0200

    This reverts commit cd4f3b7a871d7576aa052cd90faeb186da154cb5
---
 ChangeLog                                       |   13 +++++++++
 NEWS                                            |    1 +
 doc/C/gnome-commander.xml                       |    3 ++
 plugins/cvs/cvs-plugin.c                        |   28 +++++++-----------
 src/dialogs/gnome-cmd-advrename-regex-dialog.cc |    2 +-
 src/eggcellrendererkeys.cc                      |    5 ++-
 src/gnome-cmd-bookmark-dialog.cc                |    6 +++-
 src/gnome-cmd-search-dialog.cc                  |   34 +++++-----------------
 src/gnome-cmd-xml-config.cc                     |   18 +++++++-----
 9 files changed, 54 insertions(+), 56 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fe3680d..3bc58dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2009-06-01  Piotr Eljasiak  <epiotr use pl>
+
+	* src/gnome-cmd-xml-config.cc:
+	XML config: rename <TemplateHistory> -> <History>
+
+2009-05-29  Piotr Eljasiak  <epiotr use pl>
+
+	* src/eggcellrendererkeys.cc:
+	Use gtk_widget_error_bell() for GTK+ >= 2.12
+
+	* src/gnome-cmd-search-dialog.cc:
+	Fixed problem #583135 (disabled 'Go to' button in search dialog)
+
 2009-05-26  Piotr Eljasiak  <epiotr use pl>
 
 	* src/gnome-cmd-bookmark-dialog.cc:
diff --git a/NEWS b/NEWS
index ff1025a..4e8b21f 100644
--- a/NEWS
+++ b/NEWS
@@ -19,6 +19,7 @@ Bug fixes:
  * Fixed problem #571558 (replacing deprecated GNOME_STOCK_* buttons with GTK_STOCK_* counterparts)
  * Fixed problem #576174 (case insensitive file name sorting in non en_US.utf8 locale)
  * Fixed problem #579633 (accessing administrator privileges with gksudo)
+ * Fixed problem #583135 (disabled 'Go to' button in search dialog)
  * Fixed problem #583711 (crash when pressing ESC in bookmark dialog)
  * Fixed problem with setting equal pane size in horizontal mode
  * Fixed problem with refreshing MIME information after file renaming
diff --git a/doc/C/gnome-commander.xml b/doc/C/gnome-commander.xml
index 5801a90..83b007e 100644
--- a/doc/C/gnome-commander.xml
+++ b/doc/C/gnome-commander.xml
@@ -6019,6 +6019,9 @@
                             <para>Fixed problem #579633 (accessing administrator privileges with gksudo)</para>
                         </listitem>
                         <listitem>
+                            <para>Fixed problem #583135 (disabled 'Go to' button in search dialog)</para>
+                        </listitem>
+                        <listitem>
                             <para>Fixed problem #583711 (crash when pressing ESC in bookmark dialog)</para>
                         </listitem>
                         <listitem>
diff --git a/plugins/cvs/cvs-plugin.c b/plugins/cvs/cvs-plugin.c
index ddf30bb..b16a5bb 100644
--- a/plugins/cvs/cvs-plugin.c
+++ b/plugins/cvs/cvs-plugin.c
@@ -188,28 +188,22 @@ static GtkWidget *create_menu_item (const gchar *name, gboolean show_pixmap,
 
 static GtkWidget *create_main_menu (GnomeCmdPlugin *p, GnomeCmdState *state)
 {
-    GtkWidget *item, *child;
     CvsPlugin *plugin = CVS_PLUGIN (p);
     GtkMenu *submenu = GTK_MENU (gtk_menu_new ());
 
-    item = create_menu_item ("CVS", FALSE, NULL, NULL, plugin);
+    GtkWidget *item = create_menu_item ("CVS", FALSE, NULL, NULL, plugin);
     gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), GTK_WIDGET (submenu));
 
-    plugin->priv->update = child =
-        create_menu_item ("Update", FALSE, GTK_SIGNAL_FUNC (on_dummy), state, plugin);
-    gtk_menu_append (submenu, child);
-    plugin->priv->diff = child =
-        create_menu_item ("Diff", FALSE, GTK_SIGNAL_FUNC (on_diff), state, plugin);
-    gtk_menu_append (submenu, child);
-    plugin->priv->log = child =
-        create_menu_item ("Log", FALSE, GTK_SIGNAL_FUNC (on_log), state, plugin);
-    gtk_menu_append (submenu, child);
-    plugin->priv->last_log = child =
-        create_menu_item ("Last Log", FALSE, GTK_SIGNAL_FUNC (on_dummy), state, plugin);
-    gtk_menu_append (submenu, child);
-    plugin->priv->last_change = child =
-        create_menu_item ("Last Change", FALSE, GTK_SIGNAL_FUNC (on_dummy), state, plugin);
-    gtk_menu_append (submenu, child);
+    plugin->priv->update = create_menu_item ("Update", FALSE, GTK_SIGNAL_FUNC (on_dummy), state, plugin);
+    gtk_menu_append (submenu, plugin->priv->update);
+    plugin->priv->diff = create_menu_item ("Diff", FALSE, GTK_SIGNAL_FUNC (on_diff), state, plugin);
+    gtk_menu_append (submenu, plugin->priv->diff);
+    plugin->priv->log = create_menu_item ("Log", FALSE, GTK_SIGNAL_FUNC (on_log), state, plugin);
+    gtk_menu_append (submenu, plugin->priv->log);
+    plugin->priv->last_log = create_menu_item ("Last Log", FALSE, GTK_SIGNAL_FUNC (on_dummy), state, plugin);
+    gtk_menu_append (submenu, plugin->priv->last_log);
+    plugin->priv->last_change = create_menu_item ("Last Change", FALSE, GTK_SIGNAL_FUNC (on_dummy), state, plugin);
+    gtk_menu_append (submenu, plugin->priv->last_change);
 
     return item;
 }
diff --git a/src/dialogs/gnome-cmd-advrename-regex-dialog.cc b/src/dialogs/gnome-cmd-advrename-regex-dialog.cc
index b993edc..5f1dd73 100644
--- a/src/dialogs/gnome-cmd-advrename-regex-dialog.cc
+++ b/src/dialogs/gnome-cmd-advrename-regex-dialog.cc
@@ -69,7 +69,7 @@ gboolean gnome_cmd_advrename_regex_dialog_new (const gchar *title, GtkWindow *pa
     gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 5);
     gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->action_area),6);
 
-    GtkWidget *table, *align, *label, *entry, *check, *box;
+    GtkWidget *table, *align, *label, *entry, *check;
 
     table = gtk_table_new (3, 2, FALSE);
     gtk_container_set_border_width (GTK_CONTAINER (table), 5);
diff --git a/src/eggcellrendererkeys.cc b/src/eggcellrendererkeys.cc
index c3e3de3..029c41a 100644
--- a/src/eggcellrendererkeys.cc
+++ b/src/eggcellrendererkeys.cc
@@ -514,8 +514,9 @@ static gboolean grab_key_callback (GtkWidget *widget, GdkEventKey *event, EggCel
     if (keys->accel_mode == GTK_CELL_RENDERER_ACCEL_MODE_GTK)
         if (accel_key != GDK_Tab && !gtk_accelerator_valid (accel_key, (GdkModifierType) accel_mods))
         {
-            // gtk_widget_error_bell (widget);     // FIXME: since 2.12, uncomment when dependency is met
-
+#if GTK_CHECK_VERSION (2, 12, 0)
+            gtk_widget_error_bell (widget);
+#endif
             return TRUE;
         }
 
diff --git a/src/gnome-cmd-bookmark-dialog.cc b/src/gnome-cmd-bookmark-dialog.cc
index 42507d5..63547f2 100644
--- a/src/gnome-cmd-bookmark-dialog.cc
+++ b/src/gnome-cmd-bookmark-dialog.cc
@@ -272,7 +272,8 @@ static void on_dir_move_up (GtkButton *button, GnomeCmdBookmarkDialog *dialog)
 {
     GtkCList *dir_list = GTK_CLIST (dialog->priv->dir_list);
 
-    if (dir_list->focus_row >= 1) {
+    if (dir_list->focus_row >= 1)
+    {
         gtk_clist_row_move (dir_list, dir_list->focus_row, dir_list->focus_row-1);
         update_move_buttons (dialog, dir_list->focus_row);
     }
@@ -283,7 +284,8 @@ static void on_dir_move_down (GtkButton *button, GnomeCmdBookmarkDialog *dialog)
 {
     GtkCList *dir_list = GTK_CLIST (dialog->priv->dir_list);
 
-    if (dir_list->focus_row >= 0) {
+    if (dir_list->focus_row >= 0)
+    {
         gtk_clist_row_move (dir_list, dir_list->focus_row, dir_list->focus_row+1);
         update_move_buttons (dialog, dir_list->focus_row);
     }
diff --git a/src/gnome-cmd-search-dialog.cc b/src/gnome-cmd-search-dialog.cc
index 7119ffb..c2c5068 100644
--- a/src/gnome-cmd-search-dialog.cc
+++ b/src/gnome-cmd-search-dialog.cc
@@ -120,13 +120,6 @@ struct GnomeCmdSearchDialogPrivate
 };
 
 
-static void on_list_file_clicked (GnomeCmdFileList *fl, GnomeCmdFile *f, GdkEventButton *button, GnomeCmdSearchDialog *dialog)
-{
-    if (dialog->priv->data->search_done)
-        gtk_widget_set_sensitive (dialog->priv->goto_button, TRUE);
-}
-
-
 /**
  * Puts a string in the statusbar.
  *
@@ -137,9 +130,7 @@ inline void set_statusmsg (SearchData *data, gchar *msg)
         gtk_statusbar_push (GTK_STATUSBAR (data->dialog->priv->statusbar), data->context_id, msg);
 }
 
-/**
- *
- */
+
 inline void search_file_data_free (SearchFileData  *searchfile_data)
 {
     if (searchfile_data->handle != NULL)
@@ -152,9 +143,7 @@ inline void search_file_data_free (SearchFileData  *searchfile_data)
 /**
  * Loads a file in chunks and returns the content.
  */
-static SearchFileData *read_search_file (SearchData      *data,
-                                         SearchFileData  *searchfile_data,
-                                         GnomeCmdFile    *f)
+static SearchFileData *read_search_file (SearchData *data, SearchFileData *searchfile_data, GnomeCmdFile *f)
 {
     g_return_val_if_fail (f != NULL, NULL);
     g_return_val_if_fail (f->info != NULL, NULL);
@@ -376,6 +365,8 @@ static gpointer perform_search_operation (SearchData *data)
     data->dir = NULL;
 
     data->search_done = TRUE;
+    gtk_widget_set_sensitive (data->dialog->priv->goto_button, TRUE);
+
     return NULL;
 }
 
@@ -626,10 +617,7 @@ static void on_stop (GtkButton *button, GnomeCmdSearchDialog *dialog)
 }
 
 
-/**
- * The user has clicked on the go to button
- *
- */
+//  The user has clicked on the "go to" button
 static void on_goto (GtkButton *button, GnomeCmdSearchDialog *dialog)
 {
     GnomeCmdFile *f = dialog->priv->result_list->get_selected_file();
@@ -651,7 +639,7 @@ static void on_goto (GtkButton *button, GnomeCmdSearchDialog *dialog)
 }
 
 
-static gboolean handle_list_keypress (GnomeCmdFileList *fl, GdkEventKey *event, GnomeCmdSearchDialog *dialog)
+inline gboolean handle_list_keypress (GnomeCmdFileList *fl, GdkEventKey *event, GnomeCmdSearchDialog *dialog)
 {
     switch (event->keyval)
     {
@@ -667,9 +655,7 @@ static gboolean handle_list_keypress (GnomeCmdFileList *fl, GdkEventKey *event,
     return FALSE;
 }
 
-/*
- *
- */
+
 static gboolean on_list_keypressed (GtkWidget *result_list,  GdkEventKey *event, gpointer dialog)
 {
     if (GNOME_CMD_FILE_LIST (result_list)->key_pressed(event) ||
@@ -683,10 +669,7 @@ static gboolean on_list_keypressed (GtkWidget *result_list,  GdkEventKey *event,
 }
 
 
-/**
- * The user has clicked on the "search by content" checkbutton.
- *
- */
+// The user has clicked on the "search by content" checkbutton.
 static void find_text_toggled (GtkToggleButton *togglebutton, GnomeCmdSearchDialog *dialog)
 {
     if (gtk_toggle_button_get_active (togglebutton))
@@ -944,7 +927,6 @@ static void init (GnomeCmdSearchDialog *dialog)
     g_signal_connect (G_OBJECT (dialog), "destroy", G_CALLBACK (on_dialog_destroy), NULL);
     g_signal_connect (G_OBJECT (dialog), "size-allocate", G_CALLBACK (on_dialog_size_allocate), NULL);
     g_signal_connect (G_OBJECT (dialog->priv->result_list), "key-press-event", G_CALLBACK (on_list_keypressed), dialog);
-    g_signal_connect (G_OBJECT (dialog->priv->result_list), "file-clicked", G_CALLBACK (on_list_file_clicked), dialog);
 
     gtk_signal_connect (GTK_OBJECT (dialog->priv->find_text_check), "toggled", GTK_SIGNAL_FUNC (find_text_toggled), dialog);
 
diff --git a/src/gnome-cmd-xml-config.cc b/src/gnome-cmd-xml-config.cc
index bee46f2..53d55ff 100644
--- a/src/gnome-cmd-xml-config.cc
+++ b/src/gnome-cmd-xml-config.cc
@@ -337,8 +337,8 @@ enum {XML_ELEM_NOT_FOUND,
       XML_GNOMECOMMANDER_ADVANCEDRENAMETOOL_PROFILE_REGEXES_REGEX,
       XML_GNOMECOMMANDER_ADVANCEDRENAMETOOL_PROFILE_CASECONVERSION,
       XML_GNOMECOMMANDER_ADVANCEDRENAMETOOL_PROFILE_TRIMBLANKS,
-      XML_GNOMECOMMANDER_ADVANCEDRENAMETOOL_TEMPLATEHISTORY,
-      XML_GNOMECOMMANDER_ADVANCEDRENAMETOOL_TEMPLATEHISTORY_TEMPLATE};
+      XML_GNOMECOMMANDER_ADVANCEDRENAMETOOL_HISTORY,
+      XML_GNOMECOMMANDER_ADVANCEDRENAMETOOL_HISTORY_TEMPLATE};
 
 
 static DICT<guint> xml_elem_names(XML_ELEM_NOT_FOUND);
@@ -475,7 +475,7 @@ static void xml_end (GMarkupParseContext *context,
             }
             break;
 
-        case XML_GNOMECOMMANDER_ADVANCEDRENAMETOOL_TEMPLATEHISTORY:
+        case XML_GNOMECOMMANDER_ADVANCEDRENAMETOOL_HISTORY:
             cfg->advrename_defaults.templates.reverse();
             break;
 
@@ -502,7 +502,7 @@ static void xml_end (GMarkupParseContext *context,
             xml_adv_profile.template_string = text;
             break;
 
-        case XML_GNOMECOMMANDER_ADVANCEDRENAMETOOL_TEMPLATEHISTORY_TEMPLATE:
+        case XML_GNOMECOMMANDER_ADVANCEDRENAMETOOL_HISTORY_TEMPLATE:
             // FIXME: unescape text
             cfg->advrename_defaults.templates.add(text);
             break;
@@ -533,8 +533,10 @@ gboolean gnome_cmd_xml_config_parse (const gchar *xml, gsize xml_len, GnomeCmdDa
                         {XML_GNOMECOMMANDER_ADVANCEDRENAMETOOL_PROFILE_REGEXES_REGEX, "/GnomeCommander/AdvancedRenameTool/Profile/Regexes/Regex"},
                         {XML_GNOMECOMMANDER_ADVANCEDRENAMETOOL_PROFILE_CASECONVERSION, "/GnomeCommander/AdvancedRenameTool/Profile/CaseConversion"},
                         {XML_GNOMECOMMANDER_ADVANCEDRENAMETOOL_PROFILE_TRIMBLANKS, "/GnomeCommander/AdvancedRenameTool/Profile/TrimBlanks"},
-                        {XML_GNOMECOMMANDER_ADVANCEDRENAMETOOL_TEMPLATEHISTORY, "/GnomeCommander/AdvancedRenameTool/TemplateHistory"},
-                        {XML_GNOMECOMMANDER_ADVANCEDRENAMETOOL_TEMPLATEHISTORY_TEMPLATE, "/GnomeCommander/AdvancedRenameTool/TemplateHistory/Template"}
+                        {XML_GNOMECOMMANDER_ADVANCEDRENAMETOOL_HISTORY, "/GnomeCommander/AdvancedRenameTool/History"},
+                        {XML_GNOMECOMMANDER_ADVANCEDRENAMETOOL_HISTORY_TEMPLATE, "/GnomeCommander/AdvancedRenameTool/History/Template"},
+                        {XML_GNOMECOMMANDER_ADVANCEDRENAMETOOL_HISTORY, "/GnomeCommander/AdvancedRenameTool/TemplateHistory"},                      //  FIXME: for compatibility, to be removed after 1.2.8 release
+                        {XML_GNOMECOMMANDER_ADVANCEDRENAMETOOL_HISTORY_TEMPLATE, "/GnomeCommander/AdvancedRenameTool/TemplateHistory/Template"}     //  FIXME: for compatibility, to be removed after 1.2.8 release
                        };
 
     load_data (xml_elem_names, xml_elem_data, G_N_ELEMENTS(xml_elem_data));
@@ -626,12 +628,12 @@ void gnome_cmd_xml_config_save (const gchar *path, GnomeCmdData &cfg)
         fputs("\t\t</Profile>\n", f);
     }
 
-    fputs("\t\t<TemplateHistory>\n", f);
+    fputs("\t\t<History>\n", f);
 
     for (GList *i=cfg.advrename_defaults.templates.ents; i; i=i->next)
         fprintf (f, "\t\t\t<Template>%s</Template>\n", (const gchar *) i->data);
 
-    fputs("\t\t</TemplateHistory>\n", f);
+    fputs("\t\t</History>\n", f);
     fputs("\t</AdvancedRenameTool>\n", f);
     fputs("</GnomeCommander>\n", f);
     fputs("", f);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]