Merge revisions 35747:35930 from trunk.

svn path=/branches/kill-bonobo/; revision=35931

7 files changed, 83 insertions, 34 deletions

diff --git a/shell/ChangeLog b/shell/ChangeLog
index 7c9dbea21e..6ecd53c350 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,76 @@
+2008-08-07  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #467115
+
+	* e-component-registry.h:
+	Replace button and menu icon pixbufs with an icon name string.
+
+	* e-component-registry.c (query_components):
+	No need to create pixbufs, just save the icon name.
+
+	* e-sidebar.c:
+	Remember a default icon name rather than a default pixbuf.
+
+	* e-sidebar.c (e_sidebar_add_button), (e_sidebar_change_button_icon):
+	* e-shell-window.c (e_shell_window_change_component_button_icon):
+	Take an icon name instead of a pixbuf.
+
+	* e-shell-window.c (switch_view):
+	Call gtk_window_set_icon_name() instead of gtk_window_set_icon().
+
+	* e-shell-window.c (setup_widgets):
+	Change XML from pixtype="pixbuf" to pixbuf="filename" and derive
+	an appropriate filename from the icon name.
+
+2008-08-06  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #249844
+
+	* test/evolution-test-component.c: (impl__get_userCreatableItems):
+	Do not let compiler claim.
+
+2008-08-04  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #249844
+
+	* test/evolution-test-component.c (impl__get_userCreatableItems):
+	Use C_() macro instead of Q_() macro. 
+	Use fully qualified names for "New" submenu entries. 
+
+2008-08-01  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #544862
+
+	* apps_evolution_shell.scheams.in:
+	Clarify description of "use_authentication" key.
+
+2008-07-22  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #544022
+
+	* e-shell-window-commands.c: (char *authors[]):
+	Break the escape sequence properly (compiler warning cleanup).
+
+2008-07-20  Andre Klapper  <a9016009@gmx.de>
+
+	** Fixes bug #542828
+
+	* e-shell-window-commands.c:
+	update and fix list of contributors. Patch by Maxim Ermilov.
+
+2008-07-20  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #542587
+
+	* e-shell-window.c: Use new EOnlineButton widget.
+
+2008-07-19  Tor Lillqvist  <tml@novell.com>
+
+	Bug 543758 - Never mark empty strings for translations
+
+	* main.c (main): Change _("") to explicit gettext ("") to avoid
+	potentially confusing translation tools or translators.
+
 2008-17-14  Paolo Borelli  <pborelli@katamail.com>
 
 	** Fix for bug #542889
diff --git a/shell/apps_evolution_shell.schemas.in b/shell/apps_evolution_shell.schemas.in
index 8587ecc220..76ac78e8dd 100644
--- a/shell/apps_evolution_shell.schemas.in
+++ b/shell/apps_evolution_shell.schemas.in
@@ -314,7 +314,7 @@
       <type>bool</type>
       <locale name="C">
         <short>Authenticate proxy server connections</short>
-        <long>If true, then connections to the proxy server require authentication. The username/password combo is defined by "/apps/evolution/shell/network_config/authentication_user" and locally stored password in .gnome2_private/.</long>
+        <long>If true, then connections to the proxy server require authentication. The username is retrieved from the "/apps/evolution/shell/network_config/authentication_user" GConf key, and the password is retrieved from either gnome-keyring or the ~/.gnome2_private/Evolution password file.</long>
       </locale>
     </schema>
 
diff --git a/shell/e-component-registry.c b/shell/e-component-registry.c
index ebb4cd9b9c..146ceb26a6 100644
--- a/shell/e-component-registry.c
+++ b/shell/e-component-registry.c
@@ -54,9 +54,8 @@ component_info_new (const char *id,
 	  	    const char *button_tooltips,
 		    const char *menu_label,
 		    const char *menu_accelerator,
-		    int sort_order,
-		    GdkPixbuf *button_icon,
-		    GdkPixbuf *menu_icon)
+                    const char *icon_name,
+		    int sort_order)
 {
 	EComponentInfo *info = g_new0 (EComponentInfo, 1);
 
@@ -67,16 +66,9 @@ component_info_new (const char *id,
 	info->button_tooltips = g_strdup (button_tooltips);
 	info->menu_label = g_strdup (menu_label);
 	info->menu_accelerator = g_strdup (menu_accelerator);
+        info->icon_name = g_strdup (icon_name);
 	info->sort_order = sort_order;
 
-	info->button_icon = button_icon;
-	if (info->button_icon)
-		g_object_ref (info->button_icon);
-
-	info->menu_icon = menu_icon;
-	if (info->menu_icon)
-		g_object_ref (info->menu_icon);
-
 	return info;
 }
 
@@ -90,12 +82,6 @@ component_info_free (EComponentInfo *info)
 	g_free (info->menu_label);
 	g_free (info->menu_accelerator);
 
-	if (info->button_icon)
-		g_object_unref (info->button_icon);
-
-	if (info->menu_icon)
-		g_object_unref (info->menu_icon);
-
 	if (info->iface != NULL)
 		bonobo_object_release_unref (info->iface, NULL);
 
@@ -183,7 +169,6 @@ query_components (EComponentRegistry *registry)
 		const char *icon_name;
 		const char *sort_order_string;
 		const char *tooltips;
-		GdkPixbuf *icon = NULL, *menuicon = NULL;
 		EComponentInfo *info;
 		int sort_order;
 		GNOME_Evolution_Component iface;
@@ -211,10 +196,6 @@ query_components (EComponentRegistry *registry)
 		alias = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:component_alias", NULL);
 
 		icon_name = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:button_icon", NULL);
-		if (icon_name) {
-			icon = e_icon_factory_get_icon (icon_name, E_ICON_SIZE_LARGE_TOOLBAR);
-			menuicon = e_icon_factory_get_icon (icon_name, E_ICON_SIZE_MENU);
-		}
 
 		sort_order_string = bonobo_server_info_prop_lookup (& info_list->_buffer[i],
 								    "evolution:button_sort_order", NULL);
@@ -224,15 +205,11 @@ query_components (EComponentRegistry *registry)
 			sort_order = atoi (sort_order_string);
 
 		info = component_info_new (id, iface, alias, label, tooltips, menu_label,
-					   menu_accelerator, sort_order, icon, menuicon);
+					   menu_accelerator, icon_name, sort_order);
 		set_schemas (info, & info_list->_buffer [i]);
 
 		registry->priv->infos = g_slist_prepend (registry->priv->infos, info);
 
-		if (icon != NULL)
-			g_object_unref (icon);
-		if (menuicon != NULL)
-			g_object_unref (menuicon);
 		bonobo_object_release_unref(iface, NULL);
 	}
 	g_slist_free(languages);
diff --git a/shell/e-component-registry.h b/shell/e-component-registry.h
index 0c7ff03b0e..1d5943537c 100644
--- a/shell/e-component-registry.h
+++ b/shell/e-component-registry.h
@@ -73,10 +73,9 @@ struct _EComponentInfo {
 
 	char *button_label;
 	char *button_tooltips;
-	GdkPixbuf *button_icon;
 	char *menu_label;
 	char *menu_accelerator;
-	GdkPixbuf *menu_icon;
+	char *icon_name;
 
 	int sort_order;
 
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index 4097a92314..5a8215df97 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -323,8 +323,8 @@ switch_view (EShellWindow *window, ComponentView *component_view)
 	} else
 		gtk_window_set_title (GTK_WINDOW (window), component_view->title);
 
-	if (info->button_icon)
-		gtk_window_set_icon (GTK_WINDOW (window), info->button_icon);
+	if (info->icon_name)
+		gtk_window_set_icon_name (GTK_WINDOW (window), info->icon_name);
 
 	gconf_client_set_string (gconf_client, "/apps/evolution/shell/view_defaults/component_id",
 				 (component_view->component_alias != NULL
diff --git a/shell/main.c b/shell/main.c
index 4cc2962494..f363d3bdd9 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -680,7 +680,7 @@ main (int argc, char **argv)
 				      NULL);
 
 #ifdef G_OS_WIN32
-	if (strcmp (_(""), "") == 0) {
+	if (strcmp (gettext (""), "") == 0) {
 		/* No message catalog installed for the current locale language,
 		 * so don't bother with the localisations provided by other things then
 		 * either. Reset thread locale to "en-US" and C library locale to "C".
diff --git a/shell/test/evolution-test-component.c b/shell/test/evolution-test-component.c
index 3f2b39278c..88a7b05bf9 100644
--- a/shell/test/evolution-test-component.c
+++ b/shell/test/evolution-test-component.c
@@ -105,7 +105,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
 
 	list->_buffer[0].id = CREATE_TEST_ID;
 	list->_buffer[0].description = _("New Test");
-	list->_buffer[0].menuDescription = _("_Test");
+	list->_buffer[0].menuDescription = (char *) C_("New", "_Test");
 	list->_buffer[0].tooltip = _("Create a new test item");
 	list->_buffer[0].menuShortcut = 'i';
 	list->_buffer[0].iconName = "";