[glom/maemo5] glom.glade: Use a consistent name for help buttons.

[Murray Cumming <murrayc src gnome org>]

commit 85ec8e67c59c47c73c624a1ce9262e1d986465a9
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Sep 28 09:50:15 2009 +0200

    glom.glade: Use a consistent name for help buttons.

 glom/glom.glade  |   12 ++++++------
 glom/utils_ui.cc |    7 +++----
 2 files changed, 9 insertions(+), 10 deletions(-)
---
diff --git a/glom/glom.glade b/glom/glom.glade
index 130b473..8fe6b3c 100644
--- a/glom/glom.glade
+++ b/glom/glom.glade
@@ -362,7 +362,7 @@
             <property name="visible">True</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="helpbutton1">
+              <object class="GtkButton" id="helpbutton">
                 <property name="label">gtk-help</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -414,7 +414,7 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="-11">helpbutton1</action-widget>
+      <action-widget response="-11">helpbutton</action-widget>
       <action-widget response="-7">cancelbutton1</action-widget>
       <action-widget response="0">existing_or_new_button_select</action-widget>
     </action-widgets>
@@ -663,7 +663,7 @@
             <property name="visible">True</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="button11">
+              <object class="GtkButton" id="helpbutton">
                 <property name="label">gtk-help</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -1563,7 +1563,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="import_csv_help_button">
+              <object class="GtkButton" id="helpbutton">
                 <property name="label">gtk-help</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -1588,7 +1588,7 @@
     <action-widgets>
       <action-widget response="-6">import_csv_cancel_button</action-widget>
       <action-widget response="-3">import_csv_import_button</action-widget>
-      <action-widget response="-11">import_csv_help_button</action-widget>
+      <action-widget response="-11">helpbutton</action-widget>
     </action-widgets>
   </object>
   <object class="GtkDialog" id="dialog_data_invalid_format">
@@ -1667,7 +1667,7 @@ The data in the field was not recognized. Please try to correct the data or reve
             <property name="visible">True</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="button1">
+              <object class="GtkButton" id="helpbutton">
                 <property name="label">gtk-help</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
diff --git a/glom/utils_ui.cc b/glom/utils_ui.cc
index 4df59bd..427c48c 100644
--- a/glom/utils_ui.cc
+++ b/glom/utils_ui.cc
@@ -91,12 +91,11 @@ std::string locate_help_file(const std::string& path, const std::string& doc_nam
 namespace Glom
 {
 
-/* Run dialog and response on Help if appropriate */
-
+// Run dialog and response on Help if appropriate.
 int Utils::dialog_run_with_help(Gtk::Dialog* dialog, const Glib::ustring& id)
 {
-  int result = dialog->run();
-  while (result == Gtk::RESPONSE_HELP)
+  const int result = dialog->run();
+  while(result == Gtk::RESPONSE_HELP)
   {
     show_help(id);
     result = dialog->run();