Merge lp:~jjardon/libappindicator/fix-820080 into lp:libappindicator

[Javier Jardón]

[Andrea Cimitan (cimi)]

I don't know which is the default coding style, but from the snippet I see you might want to remove the space between function names and their brackets

review: Approve

[Ted Gould (ted)]

While I agree that this is the "right" way to do it, GIcon support has been broken in GTK+ for a while and was causing upstream GNOME maintainers to claim our work was shoddy.

https://bugzilla.gnome.org/show_bug.cgi?id=614800

So that's why we stopped using it.

review: Disapprove

[Ted Gould (ted)]

Sorry I took so long on this. We can't drop adding the "-panel" name extension on the icons as we want the fallback to look the same as the icon would look in the primary case. The "-panel" extension is used so that icon themes can theme the panel differently as they're not given anything like a StyleContext to determine their location otherwise.

review: Disapprove

Unmerged revisions

215. By Javier Jardón on 2011-09-22

Do not append "-panel" to the given icon name if it's missing.

As the -panel variant can not exist. Also, GtkStatusIcon
support fixed-sized icons nowadays.

Fix https://bugs.launchpad.net/libappindicator/+bug/820080

=== modified file 'src/app-indicator.c'
--- src/app-indicator.c	2011-07-22 19:04:23 +0000
+++ src/app-indicator.c	2011-09-22 21:28:24 +0000
@@ -48,8 +48,6 @@
 #include "dbus-shared.h"
 #include "generate-id.h"
 
-#define PANEL_ICON_SUFFIX  "panel"
-
 /**
  * AppIndicatorPrivate:
  * All of the private data in an instance of an application indicator.
@@ -183,7 +181,6 @@
 static void status_icon_activate (GtkStatusIcon * icon, gpointer data);
 static void status_icon_menu_activate (GtkStatusIcon *status_icon, guint button, guint activate_time, gpointer user_data);
 static void unfallback (AppIndicator * self, GtkStatusIcon * status_icon);
-static gchar * append_panel_icon_suffix (const gchar * icon_name);
 static void watcher_owner_changed (GObject * obj, GParamSpec * pspec, gpointer user_data);
 static void theme_changed_cb (GtkIconTheme * theme, gpointer user_data);
 static void sec_activate_target_parent_changed(GtkWidget *menuitem, GtkWidget *old_parent, gpointer   user_data);
@@ -1521,30 +1518,26 @@
 status_icon_changes (AppIndicator * self, gpointer data)
 {
 	GtkStatusIcon * icon = GTK_STATUS_ICON(data);
-	gchar *longname = NULL;
+	const gchar *icon_name;
 
 	switch (app_indicator_get_status(self)) {
 	case APP_INDICATOR_STATUS_PASSIVE:
-		longname = append_panel_icon_suffix(app_indicator_get_icon(self));
+		icon_name = app_indicator_get_icon (self);
 		gtk_status_icon_set_visible(icon, FALSE);
-		gtk_status_icon_set_from_icon_name(icon, longname);
+		gtk_status_icon_set_from_icon_name(icon, icon_name);
 		break;
 	case APP_INDICATOR_STATUS_ACTIVE:
-		longname = append_panel_icon_suffix(app_indicator_get_icon(self));
-		gtk_status_icon_set_from_icon_name(icon, longname);
+		icon_name = app_indicator_get_icon (self);
+		gtk_status_icon_set_from_icon_name(icon, icon_name);
 		gtk_status_icon_set_visible(icon, TRUE);
 		break;
 	case APP_INDICATOR_STATUS_ATTENTION:
-		longname = append_panel_icon_suffix(app_indicator_get_attention_icon(self));
-		gtk_status_icon_set_from_icon_name(icon, longname);
+		icon_name = app_indicator_get_icon (self);
+		gtk_status_icon_set_from_icon_name(icon, icon_name);
 		gtk_status_icon_set_visible(icon, TRUE);
 		break;
 	};
 
-	if (longname) {
-		g_free(longname);
-	}
-
 	return;
 }
 
@@ -1590,23 +1583,6 @@
 	return;
 }
 
-/* A helper function that appends PANEL_ICON_SUFFIX to the given icon name
-   if it's missing. */
-static gchar *
-append_panel_icon_suffix (const gchar *icon_name)
-{
-	gchar * long_name = NULL;
-
-	if (!g_str_has_suffix (icon_name, PANEL_ICON_SUFFIX)) {
-		long_name =
-		    g_strdup_printf("%s-%s", icon_name, PANEL_ICON_SUFFIX);
-        } else {
-           	long_name = g_strdup (icon_name);
-        }
-
-	return long_name;	
-}
-
 static gboolean
 widget_is_menu_child(AppIndicator * self, GtkWidget *child)
 {