diff options
| author | Ted Gould <ted@canonical.com> | 2009-08-27 12:53:11 -0500 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2009-08-27 12:53:11 -0500 |
| commit | afc824d8ca3cd0465d5700c8afbe07fb932c00c9 (patch) | |
| tree | 1926914c224f8c96d174280fd31f2b38854e249e | |
| parent | 78f43614f7b138d092c6ca823ea0ce95b94c30e6 (diff) | |
| parent | 1765940759064c0d7cd8428a3c89fa862f24f076 (diff) | |
| download | ayatana-indicator-session-afc824d8ca3cd0465d5700c8afbe07fb932c00c9.tar.gz ayatana-indicator-session-afc824d8ca3cd0465d5700c8afbe07fb932c00c9.tar.bz2 ayatana-indicator-session-afc824d8ca3cd0465d5700c8afbe07fb932c00c9.zip | |
Merge from upstream
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | src/indicator-session.c | 33 |
3 files changed, 39 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index ac90330..c1fc1ec 100644 --- a/configure.ac +++ b/configure.ac @@ -25,7 +25,7 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) GTK_REQUIRED_VERSION=2.12 INDICATOR_REQUIRED_VERSION=0.2.0 -DBUSMENUGTK_REQUIRED_VERSION=0.0.0 +DBUSMENUGTK_REQUIRED_VERSION=0.0.2 PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION indicator >= $INDICATOR_REQUIRED_VERSION diff --git a/debian/changelog b/debian/changelog index a941d0c..e559176 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-session (0.1~bzr18-0ubuntu1~ppa3~dbusmenu1) UNRELEASED; urgency=low + + * Merge from upstream + + -- Ted Gould <ted@ubuntu.com> Thu, 27 Aug 2009 12:52:54 -0500 + indicator-session (0.1~bzr18-0ubuntu1~ppa2) karmic; urgency=low * debian/control: Shortening the short description and lengthening diff --git a/src/indicator-session.c b/src/indicator-session.c index 07efc86..43c568f 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -61,6 +61,7 @@ static void child_added (DbusmenuMenuitem * parent, DbusmenuMenuitem * child, gu static guint status_menu_pos_offset (void); static guint users_menu_pos_offset (void); static guint session_menu_pos_offset (void); +static void child_realized (DbusmenuMenuitem * child, gpointer userdata); GtkLabel * get_label (void) @@ -79,14 +80,44 @@ get_icon (void) return status_image; } +typedef struct _realized_data_t realized_data_t; +struct _realized_data_t { + guint position; + section_t section; +}; + static void child_added (DbusmenuMenuitem * parent, DbusmenuMenuitem * child, guint position, gpointer section) { + realized_data_t * data = g_new0(realized_data_t, 1); + if (data == NULL) { + g_warning("Unable to allocate data for realization of item"); + return; + } + + data->position = position; + data->section = GPOINTER_TO_UINT(section); + + g_signal_connect(G_OBJECT(child), DBUSMENU_MENUITEM_SIGNAL_REALIZED, G_CALLBACK(child_realized), data); + return; +} + +static void +child_realized (DbusmenuMenuitem * child, gpointer userdata) +{ + g_return_if_fail(userdata != NULL); + g_return_if_fail(DBUSMENU_IS_MENUITEM(child)); + + realized_data_t * data = (realized_data_t *)userdata; + guint position = data->position; + section_t section = data->section; + g_free(data); + DbusmenuGtkClient * client = NULL; gchar * errorstr = NULL; guint (*posfunc) (void) = NULL; - switch (GPOINTER_TO_UINT(section)) { + switch (section) { case STATUS_SECTION: client = status_client; errorstr = "Status"; |