Hack GtkIconTheme so we can reference category icons as named icons.

Necessary for EActionComboBox, since GtkActions can only handle named
or stock icons.  Hopefully this is just a temporary hack.  Eventually
we should make the category icons themeable.

Kill the "mail-account-disable" plugin and integrate it properly.
More dead plugins to follow...

Don't show disabled menu items in pop-up context menus.  It does the
user no good to see things he CAN'T do with the object he clicked on.

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

9 files changed, 12 insertions, 25 deletions

diff --git a/plugins/calendar-weather/Makefile.am b/plugins/calendar-weather/Makefile.am
index 2e2be150e3..cb0253e8fe 100644
--- a/plugins/calendar-weather/Makefile.am
+++ b/plugins/calendar-weather/Makefile.am
@@ -1,5 +1,4 @@
 eds_datadir = `pkg-config --variable=privdatadir evolution-data-server-1.2`
-weatherdatadir = $(datadir)/evolution/$(BASE_VERSION)/weather
 
 INCLUDES =									\
 	-I$(top_srcdir)								\
@@ -12,15 +11,6 @@ INCLUDES =									\
 
 @EVO_PLUGIN_RULE@
 
-weatherdata_DATA = \
-	category_weather_cloudy_16.png		\
-	category_weather_fog_16.png		\
-	category_weather_partly_cloudy_16.png	\
-	category_weather_rain_16.png		\
-	category_weather_snow_16.png		\
-	category_weather_sun_16.png		\
-	category_weather_tstorm_16.png
-
 plugin_DATA = org-gnome-calendar-weather.eplug
 plugin_LTLIBRARIES = liborg-gnome-calendar-weather.la
 
diff --git a/plugins/calendar-weather/calendar-weather.c b/plugins/calendar-weather/calendar-weather.c
index a6dce31326..c16883ae23 100644
--- a/plugins/calendar-weather/calendar-weather.c
+++ b/plugins/calendar-weather/calendar-weather.c
@@ -51,8 +51,8 @@ int
 e_plugin_lib_enable (EPluginLib *epl, int enable)
 {
 	GList *l;
-	gboolean found = FALSE;
-	const char *tmp;
+	const gchar *tmp;
+	gint ii;
 
 	static struct {
 		const char *description;
@@ -74,24 +74,21 @@ e_plugin_lib_enable (EPluginLib *epl, int enable)
 
 	/* Add the categories icons if we don't have them. */
 	for (l = e_categories_get_list (); l; l = g_list_next (l)) {
-		if (!strcmp ((const char *)l->data, tmp)) {
-			found = TRUE;
-			break;
-		}
+		if (!strcmp ((const char *)l->data, tmp))
+			goto exit;
 	}
 
-	if (!found) {
-		int i;
-
-		for (i = 0; categories[i].description; i++) {
-			char *filename;
+	for (ii = 0; categories[ii].description; ii++) {
+		char *filename;
 
-			filename = e_icon_factory_get_icon_filename (categories[i].icon_name, E_ICON_SIZE_MENU);
-			e_categories_add (_(categories[i].description), NULL, filename, FALSE);
-			g_free (filename);
-		}
+		filename = e_icon_factory_get_icon_filename (
+			categories[ii].icon_name, E_ICON_SIZE_MENU);
+		e_categories_add (
+			_(categories[ii].description), NULL, filename, FALSE);
+		g_free (filename);
 	}
 
+exit:
 	return 0;
 }
 
diff --git a/plugins/calendar-weather/category_weather_cloudy_16.png b/plugins/calendar-weather/category_weather_cloudy_16.png
deleted file mode 100644
index ddb3ba7c59..0000000000
--- a/plugins/calendar-weather/category_weather_cloudy_16.png
+++ /dev/null
diff --git a/plugins/calendar-weather/category_weather_fog_16.png b/plugins/calendar-weather/category_weather_fog_16.png
deleted file mode 100644
index 23e4e2f1d4..0000000000
--- a/plugins/calendar-weather/category_weather_fog_16.png
+++ /dev/null
diff --git a/plugins/calendar-weather/category_weather_partly_cloudy_16.png b/plugins/calendar-weather/category_weather_partly_cloudy_16.png
deleted file mode 100644
index 472feaa654..0000000000
--- a/plugins/calendar-weather/category_weather_partly_cloudy_16.png
+++ /dev/null
diff --git a/plugins/calendar-weather/category_weather_rain_16.png b/plugins/calendar-weather/category_weather_rain_16.png
deleted file mode 100644
index e00d5e1c82..0000000000
--- a/plugins/calendar-weather/category_weather_rain_16.png
+++ /dev/null
diff --git a/plugins/calendar-weather/category_weather_snow_16.png b/plugins/calendar-weather/category_weather_snow_16.png
deleted file mode 100644
index 5e95985f5f..0000000000
--- a/plugins/calendar-weather/category_weather_snow_16.png
+++ /dev/null
diff --git a/plugins/calendar-weather/category_weather_sun_16.png b/plugins/calendar-weather/category_weather_sun_16.png
deleted file mode 100644
index 780c61c23c..0000000000
--- a/plugins/calendar-weather/category_weather_sun_16.png
+++ /dev/null
diff --git a/plugins/calendar-weather/category_weather_tstorm_16.png b/plugins/calendar-weather/category_weather_tstorm_16.png
deleted file mode 100644
index b2af092b53..0000000000
--- a/plugins/calendar-weather/category_weather_tstorm_16.png
+++ /dev/null