diff options
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | src/indicator-application.c | 14 | ||||
| -rw-r--r-- | src/libappindicator/app-indicator.c | 2 | ||||
| -rw-r--r-- | tests/test-libappindicator-status-client.c | 2 |
5 files changed, 22 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 219a08e..bf404e1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(indicator-application, 0.0.14, ted@canonical.com) +AC_INIT(indicator-application, 0.0.15, ted@canonical.com) AC_COPYRIGHT([Copyright 2009, 2010 Canonical]) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-application, 0.0.14) +AM_INIT_AUTOMAKE(indicator-application, 0.0.15) AM_MAINTAINER_MODE diff --git a/debian/changelog b/debian/changelog index a5a5964..30c0879 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +indicator-application (0.0.15-0ubuntu1~ppa1) UNRELEASED; urgency=low + + * Upstream release 0.0.15 + * Icon size fix to 22 px + * Status icon correctly removed in fallback + * Fixed test suite to run better on slow machines. + + -- Ted Gould <ted@ubuntu.com> Thu, 04 Mar 2010 11:39:01 -0600 + indicator-application (0.0.14-0ubuntu1) lucid; urgency=low * Upstream release 0.0.14 diff --git a/src/indicator-application.c b/src/indicator-application.c index 170e0d4..d89874e 100644 --- a/src/indicator-application.c +++ b/src/indicator-application.c @@ -66,7 +66,6 @@ GType indicator_application_get_type (void); INDICATOR_SET_VERSION INDICATOR_SET_TYPE(INDICATOR_APPLICATION_TYPE) - #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -90,6 +89,9 @@ struct _ApplicationEntry { gchar * dbusaddress; }; +#define DESIGN_TEAM_SIZE design_team_size +static GtkIconSize design_team_size; + #define INDICATOR_APPLICATION_GET_PRIVATE(o) \ (G_TYPE_INSTANCE_GET_PRIVATE ((o), INDICATOR_APPLICATION_TYPE, IndicatorApplicationPrivate)) @@ -144,6 +146,8 @@ indicator_application_class_init (IndicatorApplicationClass *klass) G_TYPE_STRING, G_TYPE_INVALID); + design_team_size = gtk_icon_size_register("design-team-size", 22, 22); + return; } @@ -449,9 +453,9 @@ application_added (DBusGProxy * proxy, const gchar * iconname, gint position, co just use the name we were given. */ gchar * longname = g_strdup_printf("%s-%s", iconname, PANEL_ICON_SUFFIX); if (gtk_icon_theme_has_icon(gtk_icon_theme_get_default(), longname)) { - app->entry.image = GTK_IMAGE(gtk_image_new_from_icon_name(longname, GTK_ICON_SIZE_MENU)); + app->entry.image = GTK_IMAGE(gtk_image_new_from_icon_name(longname, DESIGN_TEAM_SIZE)); } else { - app->entry.image = GTK_IMAGE(gtk_image_new_from_icon_name(iconname, GTK_ICON_SIZE_MENU)); + app->entry.image = GTK_IMAGE(gtk_image_new_from_icon_name(iconname, DESIGN_TEAM_SIZE)); } g_free(longname); @@ -532,10 +536,10 @@ application_icon_changed (DBusGProxy * proxy, gint position, const gchar * iconn gchar * longname = g_strdup_printf("%s-%s", iconname, PANEL_ICON_SUFFIX); if (gtk_icon_theme_has_icon(gtk_icon_theme_get_default(), longname)) { g_debug("Setting icon on %d to %s", position, longname); - gtk_image_set_from_icon_name(app->entry.image, longname, GTK_ICON_SIZE_MENU); + gtk_image_set_from_icon_name(app->entry.image, longname, DESIGN_TEAM_SIZE); } else { g_debug("Setting icon on %d to %s", position, iconname); - gtk_image_set_from_icon_name(app->entry.image, iconname, GTK_ICON_SIZE_MENU); + gtk_image_set_from_icon_name(app->entry.image, iconname, DESIGN_TEAM_SIZE); } g_free(longname); diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c index 1796e8e..ef9f5c0 100644 --- a/src/libappindicator/app-indicator.c +++ b/src/libappindicator/app-indicator.c @@ -895,7 +895,7 @@ unfallback (AppIndicator * self, GtkStatusIcon * status_icon) { g_signal_handlers_disconnect_by_func(G_OBJECT(self), status_icon_status_wrapper, status_icon); g_signal_handlers_disconnect_by_func(G_OBJECT(self), status_icon_changes, status_icon); - gtk_widget_hide(GTK_WIDGET(status_icon)); + gtk_status_icon_set_visible(status_icon, FALSE); g_object_unref(G_OBJECT(status_icon)); return; } diff --git a/tests/test-libappindicator-status-client.c b/tests/test-libappindicator-status-client.c index acf4fca..9e39ed8 100644 --- a/tests/test-libappindicator-status-client.c +++ b/tests/test-libappindicator-status-client.c @@ -137,7 +137,7 @@ main (gint argc, gchar * argv[]) dbus_bus_add_match(dbus_g_connection_get_connection(session_bus), "type='signal',interface='" NOTIFICATION_ITEM_DBUS_IFACE "',member='NewStatus'", NULL); watchdog_hit = TRUE; - g_timeout_add(250, kill_func, NULL); + g_timeout_add(1000, kill_func, NULL); mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); |