diff options
| author | Ted Gould <ted@gould.cx> | 2010-01-13 16:11:02 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-01-13 16:11:02 -0600 |
| commit | 15176e38552ba5371a5c0cd2172f1a907f460666 (patch) | |
| tree | e38da0d667fdb3966268601271f59860f5199a72 | |
| parent | 556b0bc067033732e647fcb9241c83c7adb96dee (diff) | |
| parent | bf390ec6d9aa02fe5fed6278f6f9bb249557e210 (diff) | |
| download | ayatana-indicator-application-15176e38552ba5371a5c0cd2172f1a907f460666.tar.gz ayatana-indicator-application-15176e38552ba5371a5c0cd2172f1a907f460666.tar.bz2 ayatana-indicator-application-15176e38552ba5371a5c0cd2172f1a907f460666.zip | |
* Upstream update
* Looking at StatusIcon fallback
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | src/libappindicator/app-indicator.c | 12 |
2 files changed, 19 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index dd2cfe7..ff9c010 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-application (0.0.8-0ubuntu1~ppa2~fallback5) UNRELEASED; urgency=low + + * Upstream update + * Looking at StatusIcon fallback + + -- Ted Gould <ted@ubuntu.com> Wed, 13 Jan 2010 16:10:41 -0600 + indicator-application (0.0.8-0ubuntu1~ppa2~fallback4) karmic; urgency=low * Upstream update diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c index 7dd2894..e38e760 100644 --- a/src/libappindicator/app-indicator.c +++ b/src/libappindicator/app-indicator.c @@ -136,6 +136,7 @@ static void register_service_cb (DBusGProxy * proxy, GError * error, gpointer da static void start_fallback_timer (AppIndicator * self, gboolean do_it_now); static gboolean fallback_timer_expire (gpointer data); static GtkStatusIcon * fallback (AppIndicator * self); +static void status_icon_activate (GtkStatusIcon * icon, gpointer data); static void unfallback (AppIndicator * self, GtkStatusIcon * status_icon); static void watcher_proxy_destroyed (GObject * object, gpointer data); @@ -765,9 +766,20 @@ fallback (AppIndicator * self) break; }; + g_signal_connect(G_OBJECT(icon), "activate", G_CALLBACK(status_icon_activate), self); + return NULL; } +/* Handles the activate action by the status icon by showing + the menu in a popup. */ +static void +status_icon_activate (GtkStatusIcon * icon, gpointer data) +{ + g_debug("Status Icon Activate"); + return; +} + /* Removes the status icon as the application indicator area is now up and running again. */ static void |