[network-manager-applet] glade: fix widget name collisions

[Dan Williams <dcbw src gnome org>]

commit 39f838df34919802408c0f398b3bf0ceb9e94296
Author: Dan Williams <dcbw redhat com>
Date:   Tue Mar 23 17:03:26 2010 -0700

    glade: fix widget name collisions
    
    Prevented the wireless secrets dialog from showing because it and
    the unlock dialog both provided hbox1.

 src/applet-dialogs.c |    6 +++---
 src/applet.glade     |   14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/src/applet-dialogs.c b/src/applet-dialogs.c
index a7b0687..5b891d0 100644
--- a/src/applet-dialogs.c
+++ b/src/applet-dialogs.c
@@ -986,7 +986,7 @@ mpd_set_entry (GtkWidget *dialog,
 	widget = glade_xml_get_widget (xml, "code3_entry");
 	entry3_active = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (widget), "active"));
 
-	widget = glade_xml_get_widget (xml, "table1");
+	widget = glade_xml_get_widget (xml, "table14");
 	if (entry2_active || entry3_active)
 		gtk_table_set_row_spacings (GTK_TABLE (widget), 6);
 	else
@@ -1097,7 +1097,7 @@ applet_mobile_pin_dialog_start_spinner (GtkWidget *dialog, const char *text)
 	gtk_widget_set_sensitive (widget, FALSE);
 	widget = glade_xml_get_widget (xml, "unlock_button");
 	gtk_widget_set_sensitive (widget, FALSE);
-	widget = glade_xml_get_widget (xml, "cancel_button");
+	widget = glade_xml_get_widget (xml, "unlock_cancel_button");
 	gtk_widget_set_sensitive (widget, FALSE);
 }
 
@@ -1137,7 +1137,7 @@ applet_mobile_pin_dialog_stop_spinner (GtkWidget *dialog, const char *text)
 	gtk_widget_set_sensitive (widget, TRUE);
 	widget = glade_xml_get_widget (xml, "unlock_button");
 	gtk_widget_set_sensitive (widget, TRUE);
-	widget = glade_xml_get_widget (xml, "cancel_button");
+	widget = glade_xml_get_widget (xml, "unlock_cancel_button");
 	gtk_widget_set_sensitive (widget, TRUE);
 }
 
diff --git a/src/applet.glade b/src/applet.glade
index b506dc5..70d00a5 100644
--- a/src/applet.glade
+++ b/src/applet.glade
@@ -302,7 +302,7 @@
                 <property name="border_width">5</property>
                 <property name="spacing">12</property>
                 <child>
-                  <widget class="GtkImage" id="image1">
+                  <widget class="GtkImage" id="image6">
                     <property name="visible">True</property>
                     <property name="yalign">0</property>
                     <property name="stock">gtk-dialog-info</property>
@@ -1810,15 +1810,15 @@ Version 1</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child>
-          <widget class="GtkHBox" id="hbox1">
+          <widget class="GtkHBox" id="hbox7">
             <property name="visible">True</property>
             <property name="spacing">6</property>
             <child>
-              <widget class="GtkAlignment" id="alignment1">
+              <widget class="GtkAlignment" id="alignment5">
                 <property name="visible">True</property>
                 <property name="yalign">0</property>
                 <child>
-                  <widget class="GtkImage" id="image1">
+                  <widget class="GtkImage" id="image7">
                     <property name="visible">True</property>
                     <property name="yalign">0</property>
                     <property name="stock">gtk-dialog-authentication</property>
@@ -1833,7 +1833,7 @@ Version 1</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkVBox" id="vbox1">
+              <widget class="GtkVBox" id="vbox3">
                 <property name="visible">True</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">12</property>
@@ -1872,7 +1872,7 @@ Version 1</property>
                     <property name="left_padding">12</property>
                     <property name="right_padding">12</property>
                     <child>
-                      <widget class="GtkTable" id="table1">
+                      <widget class="GtkTable" id="table14">
                         <property name="visible">True</property>
                         <property name="n_rows">4</property>
                         <property name="n_columns">2</property>
@@ -2017,7 +2017,7 @@ Version 1</property>
             <property name="visible">True</property>
             <property name="layout_style">end</property>
             <child>
-              <widget class="GtkButton" id="cancel_button">
+              <widget class="GtkButton" id="unlock_cancel_button">
                 <property name="label">gtk-cancel</property>
                 <property name="response_id">-6</property>
                 <property name="visible">True</property>