aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-03-11 16:18:48 -0600
committerTed Gould <ted@gould.cx>2010-03-11 16:18:48 -0600
commit837d67948cfa29fc99f5b1336c8ef0ca1eb45e99 (patch)
tree921181b7e62b0a95efc9312f87564338c51745ce
parent9504966c66f3241612afe27b52fcd8745052afa2 (diff)
parentbf1f1526eb6d0c220dba945d42ab72c6f6a1d636 (diff)
downloadlibayatana-appindicator-837d67948cfa29fc99f5b1336c8ef0ca1eb45e99.tar.gz
libayatana-appindicator-837d67948cfa29fc99f5b1336c8ef0ca1eb45e99.tar.bz2
libayatana-appindicator-837d67948cfa29fc99f5b1336c8ef0ca1eb45e99.zip
* Upstream release 0.0.16
* Use libindicator icon loading helper * Workaround for label changes on GtkActions * Testing fix for using xvfb
-rw-r--r--configure.ac6
-rw-r--r--debian/changelog9
-rw-r--r--src/indicator-application.c20
-rw-r--r--src/libappindicator/app-indicator.c33
-rw-r--r--tests/run-xvfb.sh1
5 files changed, 49 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac
index bf404e1..f260512 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
-AC_INIT(indicator-application, 0.0.15, ted@canonical.com)
+AC_INIT(indicator-application, 0.0.16, 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.15)
+AM_INIT_AUTOMAKE(indicator-application, 0.0.16)
AM_MAINTAINER_MODE
@@ -38,7 +38,7 @@ AC_CONFIG_MACRO_DIR(m4)
###########################
GTK_REQUIRED_VERSION=2.12
-INDICATOR_REQUIRED_VERSION=0.3.1
+INDICATOR_REQUIRED_VERSION=0.3.5
DBUSMENUGTK_REQUIRED_VERSION=0.2.2
JSON_GLIB_REQUIRED_VERSION=0.7.6
DBUS_GLIB_REQUIRED_VERSION=0.82
diff --git a/debian/changelog b/debian/changelog
index 54ce2a5..581733c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+indicator-application (0.0.16-0ubuntu1~ppa1) UNRELEASED; urgency=low
+
+ * Upstream release 0.0.16
+ * Use libindicator icon loading helper
+ * Workaround for label changes on GtkActions
+ * Testing fix for using xvfb
+
+ -- Ted Gould <ted@ubuntu.com> Thu, 11 Mar 2010 16:17:51 -0600
+
indicator-application (0.0.15-0ubuntu1) lucid; urgency=low
* Upstream release 0.0.15
diff --git a/src/indicator-application.c b/src/indicator-application.c
index d89874e..b681a24 100644
--- a/src/indicator-application.c
+++ b/src/indicator-application.c
@@ -35,6 +35,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
#include <libindicator/indicator.h>
#include <libindicator/indicator-object.h>
#include <libindicator/indicator-service-manager.h>
+#include <libindicator/indicator-image-helper.h>
/* Local Stuff */
#include "dbus-shared.h"
@@ -89,9 +90,6 @@ 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))
@@ -146,8 +144,6 @@ 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;
}
@@ -452,11 +448,7 @@ application_added (DBusGProxy * proxy, const gchar * iconname, gint position, co
icon is available we want to use it. Otherwise we'll
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, DESIGN_TEAM_SIZE));
- } else {
- app->entry.image = GTK_IMAGE(gtk_image_new_from_icon_name(iconname, DESIGN_TEAM_SIZE));
- }
+ app->entry.image = indicator_image_helper(longname);
g_free(longname);
app->entry.label = NULL;
@@ -534,13 +526,7 @@ application_icon_changed (DBusGProxy * proxy, gint position, const gchar * iconn
icon is available we want to use it. Otherwise we'll
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)) {
- g_debug("Setting icon on %d to %s", position, longname);
- 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, DESIGN_TEAM_SIZE);
- }
+ indicator_image_helper_update(app->entry.image, longname);
g_free(longname);
return;
diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c
index ef9f5c0..5edc9fe 100644
--- a/src/libappindicator/app-indicator.c
+++ b/src/libappindicator/app-indicator.c
@@ -1160,6 +1160,21 @@ widget_notify_cb (GtkWidget *widget,
}
static void
+action_notify_cb (GtkAction *action,
+ GParamSpec *pspec,
+ gpointer data)
+{
+ DbusmenuMenuitem *child = (DbusmenuMenuitem *)data;
+
+ if (pspec->name == g_intern_static_string ("label"))
+ {
+ dbusmenu_menuitem_property_set (child,
+ DBUSMENU_MENUITEM_PROP_LABEL,
+ gtk_action_get_label (action));
+ }
+}
+
+static void
container_iterate (GtkWidget *widget,
gpointer data)
{
@@ -1281,6 +1296,24 @@ container_iterate (GtkWidget *widget,
g_signal_connect (widget, "notify",
G_CALLBACK (widget_notify_cb), child);
+ if (GTK_IS_ACTIVATABLE (widget))
+ {
+ GtkActivatable *activatable = GTK_ACTIVATABLE (widget);
+
+ if (gtk_activatable_get_use_action_appearance (activatable))
+ {
+ GtkAction *action = gtk_activatable_get_related_action (activatable);
+
+ if (action)
+ {
+ g_signal_connect_object (action, "notify",
+ G_CALLBACK (action_notify_cb),
+ child,
+ G_CONNECT_AFTER);
+ }
+ }
+ }
+
g_signal_connect (G_OBJECT (child),
DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
G_CALLBACK (activate_menuitem), widget);
diff --git a/tests/run-xvfb.sh b/tests/run-xvfb.sh
index 3622dbf..35737c2 100644
--- a/tests/run-xvfb.sh
+++ b/tests/run-xvfb.sh
@@ -4,4 +4,5 @@ XID=`for id in 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 3
{ Xvfb -ac -noreset -screen 0 800x600x16 :$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & trap "kill -15 $! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; }
DISPLAY=:$XID
export DISPLAY
+sleep 2
fi