[anjuta] git: Widget name fixes

[James Liggett <jrliggett src gnome org>]

commit c3cec8aacd77471851f04bee8a9ae35e071ae46b
Author: James Liggett <jrliggett cox net>
Date:   Sun Apr 7 17:26:29 2013 -0700

    git: Widget name fixes

 plugins/git/anjuta-git.ui     |   42 ++++++++++++++++++++--------------------
 plugins/git/git-reset-pane.c  |    8 +++---
 plugins/git/git-revert-pane.c |   18 ++++++++--------
 3 files changed, 34 insertions(+), 34 deletions(-)
---
diff --git a/plugins/git/anjuta-git.ui b/plugins/git/anjuta-git.ui
index 1dab99f..b14075d 100644
--- a/plugins/git/anjuta-git.ui
+++ b/plugins/git/anjuta-git.ui
@@ -324,18 +324,6 @@
       </packing>
     </child>
   </object>
-  <object class="GtkListStore" id="branches_list_model">
-    <columns>
-      <!-- column-name selected -->
-      <column type="gboolean"/>
-      <!-- column-name active -->
-      <column type="gboolean"/>
-      <!-- column-name remote -->
-      <column type="gboolean"/>
-      <!-- column-name name -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
   <object class="GtkVBox" id="apply_mailbox_pane">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -465,6 +453,18 @@
       </packing>
     </child>
   </object>
+  <object class="GtkListStore" id="branches_list_model">
+    <columns>
+      <!-- column-name selected -->
+      <column type="gboolean"/>
+      <!-- column-name active -->
+      <column type="gboolean"/>
+      <!-- column-name remote -->
+      <column type="gboolean"/>
+      <!-- column-name name -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
   <object class="GtkVBox" id="branches_pane">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -2604,6 +2604,14 @@
       <column type="gchararray"/>
     </columns>
   </object>
+  <object class="GtkListStore" id="push_tag_model">
+    <columns>
+      <!-- column-name selected -->
+      <column type="gboolean"/>
+      <!-- column-name name -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
   <object class="GtkVBox" id="push_pane">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -2916,14 +2924,6 @@
       </packing>
     </child>
   </object>
-  <object class="GtkListStore" id="push_tag_model">
-    <columns>
-      <!-- column-name selected -->
-      <column type="gboolean"/>
-      <!-- column-name name -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
   <object class="GtkListStore" id="remotes_list_model">
     <columns>
       <!-- column-name name -->
@@ -3310,7 +3310,7 @@
             <property name="can_focus">False</property>
             <property name="left_padding">12</property>
             <child>
-              <object class="AnjutaDropEntry" id="commit_entry">
+              <object class="AnjutaDropEntry" id="revert_commit_entry">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="invisible_char">•</property>
diff --git a/plugins/git/git-reset-pane.c b/plugins/git/git-reset-pane.c
index 25e3a65..aa7945e 100644
--- a/plugins/git/git-reset-pane.c
+++ b/plugins/git/git-reset-pane.c
@@ -30,7 +30,7 @@ static void
 on_ok_action_activated (GtkAction *action, GitResetPane *self)
 {
        Git *plugin;
-       AnjutaEntry *revision_entry;
+       AnjutaEntry *reset_revision_entry;
        GtkToggleButton *mixed_radio;
        GtkToggleButton *soft_radio;
        const gchar *revision;
@@ -38,14 +38,14 @@ on_ok_action_activated (GtkAction *action, GitResetPane *self)
        GitResetTreeCommand *reset_command;
 
        plugin = ANJUTA_PLUGIN_GIT (anjuta_dock_pane_get_plugin (ANJUTA_DOCK_PANE (self)));
-       revision_entry = ANJUTA_ENTRY (gtk_builder_get_object (self->priv->builder,
-                                                              "revision_entry"));
+       reset_revision_entry = ANJUTA_ENTRY (gtk_builder_get_object (self->priv->builder,
+                                                                                "reset_revision_entry"));
        mixed_radio = GTK_TOGGLE_BUTTON (gtk_builder_get_object (self->priv->builder,
                                                                 "mixed_radio"));
        soft_radio = GTK_TOGGLE_BUTTON (gtk_builder_get_object (self->priv->builder,
                                                                "soft_radio"));
 
-       revision = anjuta_entry_get_text (revision_entry);
+       revision = anjuta_entry_get_text (reset_revision_entry);
 
        if (g_utf8_strlen (revision, -1) == 0)
                revision = GIT_RESET_TREE_PREVIOUS;
diff --git a/plugins/git/git-revert-pane.c b/plugins/git/git-revert-pane.c
index d80467b..7746891 100644
--- a/plugins/git/git-revert-pane.c
+++ b/plugins/git/git-revert-pane.c
@@ -30,21 +30,21 @@ static void
 on_ok_action_activated (GtkAction *action, GitRevertPane *self)
 {
        Git *plugin;
-       AnjutaEntry *commit_entry;
-       GtkToggleButton *no_commit_check;
+       AnjutaEntry *revert_commit_entry;
+       GtkToggleAction *no_commit_action;
        gchar *commit;
        GitRevertCommand *revert_command;
 
        plugin = ANJUTA_PLUGIN_GIT (anjuta_dock_pane_get_plugin (ANJUTA_DOCK_PANE (self)));
-       commit_entry = ANJUTA_ENTRY (gtk_builder_get_object (self->priv->builder,
-                                                            "commit_entry"));
-       no_commit_check = GTK_TOGGLE_BUTTON (gtk_builder_get_object (self->priv->builder,
-                                                                    "no_commit_check"));
+       revert_commit_entry = ANJUTA_ENTRY (gtk_builder_get_object (self->priv->builder,
+                                                                               "revert_commit_entry"));
+       no_commit_action = GTK_TOGGLE_ACTION (gtk_builder_get_object (self->priv->builder,
+                                                                     "no_commit_action"));
 
-       commit = anjuta_entry_dup_text (commit_entry);
+       commit = anjuta_entry_dup_text (revert_commit_entry);
 
        if (!git_pane_check_input (GTK_WIDGET (ANJUTA_PLUGIN (plugin)->shell),
-                                  GTK_WIDGET (commit_entry), commit,
+                                  GTK_WIDGET (revert_commit_entry), commit,
                                   _("Please enter a commit.")))
        {
                g_free (commit);
@@ -54,7 +54,7 @@ on_ok_action_activated (GtkAction *action, GitRevertPane *self)
 
        revert_command = git_revert_command_new (plugin->project_root_directory,
                                                 commit,
-                                                gtk_toggle_button_get_active (no_commit_check));
+                                                gtk_toggle_action_get_active (no_commit_action));
 
        g_signal_connect (G_OBJECT (revert_command), "command-finished",
                          G_CALLBACK (git_pane_report_errors),