From 480990bcb0f45c3e253291558f9647d467e6c366 Mon Sep 17 00:00:00 2001
From: Silvan Marco Fin <silvan@kernelconcepts.de>
Date: Thu, 8 Jun 2006 10:48:55 +0000
Subject: [PATCH] * some renaming in the glade file   and adaptions to the
 affected sources

pmo-trunk-r181
---
 src/gtk-glade/modest-ui-wizard.c |    2 +-
 src/gtk-glade/modest-ui.c        |    4 +-
 src/gtk-glade/modest.glade       |  259 +++++++++++++++-----------------------
 3 files changed, 107 insertions(+), 158 deletions(-)

diff --git a/src/gtk-glade/modest-ui-wizard.c b/src/gtk-glade/modest-ui-wizard.c
index 7cf1314..dbf20b2 100644
--- a/src/gtk-glade/modest-ui-wizard.c
+++ b/src/gtk-glade/modest-ui-wizard.c
@@ -222,7 +222,7 @@ void wizard_account_dialog(ModestUI *modest_ui)
                         gtk_widget_set_sensitive(NextButton, FALSE);
                         break;
                 default:
-                        g_error("I'm on page %d of notebook AWNotebook, which shouldn't have happened. Pulling Emeregency breaks.", cp);
+                        g_error("I'm on page %d of notebook AWNotebook, which shouldn't have happened. Pulling emergency breaks.", cp);
                         break;
                 }
 
diff --git a/src/gtk-glade/modest-ui.c b/src/gtk-glade/modest-ui.c
index 98d2280..784eda5 100644
--- a/src/gtk-glade/modest-ui.c
+++ b/src/gtk-glade/modest-ui.c
@@ -303,7 +303,7 @@ modest_ui_show_main_window (ModestUI *modest_ui)
 			  G_CALLBACK(on_message_clicked),
 			  modest_ui);
 
-	account_settings_item = glade_xml_get_widget (priv->glade_xml, "account_settings1");
+	account_settings_item = glade_xml_get_widget (priv->glade_xml, "AccountSettingsMenuItem");
 	if (!account_settings_item)
 	{
 		g_warning ("The account settings item isn't available!\n");
@@ -313,7 +313,7 @@ modest_ui_show_main_window (ModestUI *modest_ui)
                           G_CALLBACK(on_account_settings1_activate),
                           modest_ui);
 
-	new_account_item = glade_xml_get_widget (priv->glade_xml, "new_account1");
+	new_account_item = glade_xml_get_widget (priv->glade_xml, "NewAccountWizzardMenuItem");
 	if (!new_account_item)
 	{
 		g_warning ("The new account item isn't available!\n");
diff --git a/src/gtk-glade/modest.glade b/src/gtk-glade/modest.glade
index a2518f5..0e6a27a 100644
--- a/src/gtk-glade/modest.glade
+++ b/src/gtk-glade/modest.glade
@@ -34,13 +34,13 @@
 	  <property name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property>
 
 	  <child>
-	    <widget class="GtkMenuItem" id="menuitem1">
+	    <widget class="GtkMenuItem" id="MessageMenuItem">
 	      <property name="visible">True</property>
 	      <property name="label" translatable="yes">_Message</property>
 	      <property name="use_underline">True</property>
 
 	      <child>
-		<widget class="GtkMenu" id="menuitem1_menu">
+		<widget class="GtkMenu" id="Message_menu">
 
 		  <child>
 		    <widget class="GtkMenuItem" id="new_e-mail1">
@@ -130,13 +130,13 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkMenuItem" id="menuitem2">
+	    <widget class="GtkMenuItem" id="EditMenuItem">
 	      <property name="visible">True</property>
 	      <property name="label" translatable="yes">_Edit</property>
 	      <property name="use_underline">True</property>
 
 	      <child>
-		<widget class="GtkMenu" id="menuitem2_menu">
+		<widget class="GtkMenu" id="Edit_menu">
 
 		  <child>
 		    <widget class="GtkMenuItem" id="undo1">
@@ -231,13 +231,13 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkMenuItem" id="menuitem3">
+	    <widget class="GtkMenuItem" id="FoldersMenuItem">
 	      <property name="visible">True</property>
 	      <property name="label" translatable="yes">_Folders</property>
 	      <property name="use_underline">True</property>
 
 	      <child>
-		<widget class="GtkMenu" id="menuitem3_menu">
+		<widget class="GtkMenu" id="Folders_menu">
 
 		  <child>
 		    <widget class="GtkMenuItem" id="new_folder1">
@@ -346,13 +346,13 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkMenuItem" id="menuitem4">
+	    <widget class="GtkMenuItem" id="ViewMenuItem">
 	      <property name="visible">True</property>
 	      <property name="label" translatable="yes">_View</property>
 	      <property name="use_underline">True</property>
 
 	      <child>
-		<widget class="GtkMenu" id="menuitem4_menu">
+		<widget class="GtkMenu" id="View_menu">
 
 		  <child>
 		    <widget class="GtkMenuItem" id="sort1">
@@ -428,14 +428,14 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkMenuItem" id="e-mail1">
+	    <widget class="GtkMenuItem" id="EMailMenuItem">
 	      <property name="visible">True</property>
 	      <property name="label" translatable="yes">E-m_ail</property>
 	      <property name="use_underline">True</property>
 	      <signal name="activate" handler="on_e-mail1_activate" last_modification_time="Fri, 28 Apr 2006 12:12:02 GMT"/>
 
 	      <child>
-		<widget class="GtkMenu" id="e-mail1_menu">
+		<widget class="GtkMenu" id="EMail_menu">
 
 		  <child>
 		    <widget class="GtkMenuItem" id="send_&amp;_receive1">
@@ -469,17 +469,17 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkMenuItem" id="tools1">
+	    <widget class="GtkMenuItem" id="ToolsMenuItem">
 	      <property name="visible">True</property>
 	      <property name="label" translatable="yes">_Tools</property>
 	      <property name="use_underline">True</property>
 	      <signal name="activate" handler="on_tools1_activate" last_modification_time="Fri, 28 Apr 2006 12:12:02 GMT"/>
 
 	      <child>
-		<widget class="GtkMenu" id="tools1_menu">
+		<widget class="GtkMenu" id="Tools_menu">
 
 		  <child>
-		    <widget class="GtkMenuItem" id="open_contacts1">
+		    <widget class="GtkMenuItem" id="OpenContactsMenuItem">
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Open contacts...</property>
 		      <property name="use_underline">True</property>
@@ -494,7 +494,7 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkMenuItem" id="new_account1">
+		    <widget class="GtkMenuItem" id="NewAccountWizzardMenuItem">
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">New account...</property>
 		      <property name="use_underline">True</property>
@@ -503,7 +503,7 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkMenuItem" id="account_settings1">
+		    <widget class="GtkMenuItem" id="AccountSettingsMenuItem">
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Account settings...</property>
 		      <property name="use_underline">True</property>
@@ -512,7 +512,7 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkMenuItem" id="options1">
+		    <widget class="GtkMenuItem" id="OptionsMenuItem">
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Options</property>
 		      <property name="use_underline">True</property>
@@ -527,7 +527,7 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkMenuItem" id="search_e-mails1">
+		    <widget class="GtkMenuItem" id="SearchEMailsMenuItem">
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Search e-mails...</property>
 		      <property name="use_underline">True</property>
@@ -542,7 +542,7 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkMenuItem" id="help1">
+		    <widget class="GtkMenuItem" id="HelpMenuItem">
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Help</property>
 		      <property name="use_underline">True</property>
@@ -555,13 +555,13 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkMenuItem" id="close1">
+	    <widget class="GtkMenuItem" id="CloseMenuItem">
 	      <property name="visible">True</property>
 	      <property name="label" translatable="yes">_Close</property>
 	      <property name="use_underline">True</property>
 
 	      <child>
-		<widget class="GtkMenu" id="close1_menu">
+		<widget class="GtkMenu" id="Close_menu">
 
 		  <child>
 		    <widget class="GtkMenuItem" id="about1">
@@ -3946,40 +3946,12 @@
 	      <child>
 		<widget class="GtkTable" id="table3">
 		  <property name="visible">True</property>
-<!--		  <property name="n_rows">2</property> -->
 		  <property name="n_rows">1</property>
 		  <property name="n_columns">2</property>
 		  <property name="homogeneous">False</property>
 		  <property name="row_spacing">10</property>
 		  <property name="column_spacing">10</property>
-<!--
-		  <child>
-		    <widget class="GtkLabel" id="label14">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes" context="yes">Mailbox name:</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		      <property name="width_chars">-1</property>
-		      <property name="single_line_mode">False</property>
-		      <property name="angle">0</property>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">0</property>
-		      <property name="right_attach">1</property>
-		      <property name="top_attach">0</property>
-		      <property name="bottom_attach">1</property>
-		      <property name="x_options">fill</property>
-		    </packing>
-		  </child>
--->
+
 		  <child>
 		    <widget class="GtkLabel" id="label15">
 		      <property name="visible">True</property>
@@ -4006,34 +3978,13 @@
 		    </packing>
 		  </child>
 
-<!--
-		  <child>
-		    <widget class="GtkEntry" id="AWMailboxnameEntry">
-		      <property name="visible">True</property>
-		      <property name="editable">True</property>
-		      <property name="visibility">True</property>
-		      <property name="max_length">0</property>
-		      <property name="text" translatable="yes"></property>
-		      <property name="has_frame">True</property>
-		      <property name="invisible_char">*</property>
-		      <property name="activates_default">False</property>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">1</property>
-		      <property name="right_attach">2</property>
-		      <property name="top_attach">0</property>
-		      <property name="bottom_attach">1</property>
-		    </packing>
-		  </child>
--->
 		  <child>
 		    <widget class="GtkComboBox" id="AWMailboxtypeComboBox">
 		      <property name="visible">True</property>
-          <property name="items" context="yes" translatable="yes">imap
+		      <property name="items" translatable="yes" context="yes">imap
 pop
 local</property>
 		      <property name="add_tearoffs">False</property>
-		      <property name="has_frame">True</property>
 		      <property name="focus_on_click">True</property>
 		    </widget>
 		    <packing>
@@ -4350,99 +4301,97 @@ local</property>
 	      <property name="column_spacing">10</property>
 
 	      <child>
-          <widget class="GtkLabel" id="AWInServerLabel">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes" context="yes">Incoming server:</property>
-            <property name="use_underline">False</property>
-            <property name="use_markup">False</property>
-            <property name="justify">GTK_JUSTIFY_LEFT</property>
-            <property name="wrap">False</property>
-            <property name="selectable">False</property>
-            <property name="xalign">0</property>
-            <property name="yalign">0.5</property>
-            <property name="xpad">0</property>
-            <property name="ypad">0</property>
-            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-            <property name="width_chars">-1</property>
-            <property name="single_line_mode">False</property>
-            <property name="angle">0</property>
-          </widget>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="right_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="bottom_attach">1</property>
-            <property name="x_options">fill</property>
-            <property name="y_options"></property>
-          </packing>
+		<widget class="GtkLabel" id="AWInServerLabel">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes" context="yes">Incoming server:</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		</widget>
+		<packing>
+		  <property name="left_attach">0</property>
+		  <property name="right_attach">1</property>
+		  <property name="top_attach">0</property>
+		  <property name="bottom_attach">1</property>
+		  <property name="x_options">fill</property>
+		  <property name="y_options"></property>
+		</packing>
 	      </child>
 
 	      <child>
-          <widget class="GtkLabel" id="AWOutServerLabel">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes" context="yes">Outgoing server:</property>
-            <property name="use_underline">False</property>
-            <property name="use_markup">False</property>
-            <property name="justify">GTK_JUSTIFY_LEFT</property>
-            <property name="wrap">False</property>
-            <property name="selectable">False</property>
-            <property name="xalign">0</property>
-            <property name="yalign">0.5</property>
-            <property name="xpad">0</property>
-            <property name="ypad">0</property>
-            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-            <property name="width_chars">-1</property>
-            <property name="single_line_mode">False</property>
-            <property name="angle">0</property>
-          </widget>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="right_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="bottom_attach">2</property>
-            <property name="x_options">fill</property>
-            <property name="y_options"></property>
-          </packing>
+		<widget class="GtkLabel" id="AWOutServerLabel">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes" context="yes">Outgoing server:</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		</widget>
+		<packing>
+		  <property name="left_attach">0</property>
+		  <property name="right_attach">1</property>
+		  <property name="top_attach">1</property>
+		  <property name="bottom_attach">2</property>
+		  <property name="x_options">fill</property>
+		  <property name="y_options"></property>
+		</packing>
 	      </child>
 
 	      <child>
-          <widget class="GtkEntry" id="AWInServerComboEntry">
-            <property name="visible">True</property>
-          </widget>
-          <!--
-          <widget class="GtkComboBoxEntry" id="AWInServerComboEntry">
-            <property name="visible">True</property>
-            <property name="add_tearoffs">False</property>
-            <property name="has_frame">True</property>
-            <property name="focus_on_click">True</property>
-          </widget>
-          -->
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="right_attach">2</property>
-            <property name="top_attach">0</property>
-            <property name="bottom_attach">1</property>
-          </packing>
+		<widget class="GtkEntry" id="AWInServerComboEntry">
+		  <property name="visible">True</property>
+		  <property name="editable">True</property>
+		  <property name="visibility">True</property>
+		  <property name="max_length">0</property>
+		  <property name="text" translatable="yes"></property>
+		  <property name="has_frame">True</property>
+		  <property name="invisible_char">*</property>
+		  <property name="activates_default">False</property>
+		</widget>
+		<packing>
+		  <property name="left_attach">1</property>
+		  <property name="right_attach">2</property>
+		  <property name="top_attach">0</property>
+		  <property name="bottom_attach">1</property>
+		</packing>
 	      </child>
 
 	      <child>
-          <widget class="GtkEntry" id="AWOutServerComboEntry">
-            <property name="visible">True</property>
-          </widget>
-          <!--
-          <widget class="GtkComboBoxEntry" id="AWOutServerComboEntry">
-            <property name="visible">True</property>
-            <property name="add_tearoffs">False</property>
-            <property name="has_frame">True</property>
-            <property name="focus_on_click">True</property>
-          </widget>
-          -->
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="right_attach">2</property>
-            <property name="top_attach">1</property>
-            <property name="bottom_attach">2</property>
-          </packing>
+		<widget class="GtkEntry" id="AWOutServerComboEntry">
+		  <property name="visible">True</property>
+		  <property name="editable">True</property>
+		  <property name="visibility">True</property>
+		  <property name="max_length">0</property>
+		  <property name="text" translatable="yes"></property>
+		  <property name="has_frame">True</property>
+		  <property name="invisible_char">*</property>
+		  <property name="activates_default">False</property>
+		</widget>
+		<packing>
+		  <property name="left_attach">1</property>
+		  <property name="right_attach">2</property>
+		  <property name="top_attach">1</property>
+		  <property name="bottom_attach">2</property>
+		</packing>
 	      </child>
 	    </widget>
 	    <packing>
-- 
1.7.9.5