ayatana-commits team mailing list archive
-
ayatana-commits team
-
Mailing list archive
-
Message #00839
[Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 159: Update to new dbusmenu 0.2.2
Merge authors:
Ted Gould (ted)
------------------------------------------------------------
revno: 159 [merge]
committer: Ted Gould <ted@xxxxxxxx>
branch nick: trunk
timestamp: Thu 2010-02-04 18:16:17 -0800
message:
Update to new dbusmenu 0.2.2
modified:
configure.ac
src/app-menu-item.c
src/im-menu-item.c
src/launcher-menu-item.c
--
lp:indicator-messages
https://code.launchpad.net/~indicator-applet-developers/indicator-messages/trunk
Your team ayatana-commits is subscribed to branch lp:indicator-messages.
To unsubscribe from this branch go to https://code.launchpad.net/~indicator-applet-developers/indicator-messages/trunk/+edit-subscription.
=== modified file 'configure.ac'
--- configure.ac 2010-01-08 18:00:55 +0000
+++ configure.ac 2010-02-05 02:05:53 +0000
@@ -31,7 +31,7 @@
PANEL_REQUIRED_VERSION=2.0.0
INDICATE_REQUIRED_VERSION=0.2.0
INDICATOR_REQUIRED_VERSION=0.3.0
-DBUSMENUGTK_REQUIRED_VERSION=0.2.0
+DBUSMENUGTK_REQUIRED_VERSION=0.2.2
PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION
gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
=== modified file 'src/app-menu-item.c'
--- src/app-menu-item.c 2009-09-05 16:43:36 +0000
+++ src/app-menu-item.c 2010-02-05 02:12:10 +0000
@@ -57,7 +57,7 @@
static void app_menu_item_init (AppMenuItem *self);
static void app_menu_item_dispose (GObject *object);
static void app_menu_item_finalize (GObject *object);
-static void activate_cb (AppMenuItem * self, gpointer data);
+static void activate_cb (AppMenuItem * self, guint timestamp, gpointer data);
static void count_changed (IndicateListener * listener, IndicateListenerServer * server, guint count, gpointer data);
static void count_cb (IndicateListener * listener, IndicateListenerServer * server, guint value, gpointer data);
static void desktop_cb (IndicateListener * listener, IndicateListenerServer * server, gchar * value, gpointer data);
@@ -259,11 +259,11 @@
}
static void
-activate_cb (AppMenuItem * self, gpointer data)
+activate_cb (AppMenuItem * self, guint timestamp, gpointer data)
{
AppMenuItemPrivate * priv = APP_MENU_ITEM_GET_PRIVATE(self);
- indicate_listener_display(priv->listener, priv->server, NULL);
+ indicate_listener_display(priv->listener, priv->server, NULL, timestamp);
return;
}
=== modified file 'src/im-menu-item.c'
--- src/im-menu-item.c 2009-12-18 21:46:18 +0000
+++ src/im-menu-item.c 2010-02-05 02:12:10 +0000
@@ -68,21 +68,22 @@
IndicateListenerServer * server,
IndicateListenerIndicator * indicator,
gchar * property,
- gchar * propertydata,
+ const gchar * propertydata,
gpointer data);
static void time_cb (IndicateListener * listener,
IndicateListenerServer * server,
IndicateListenerIndicator * indicator,
gchar * property,
- GTimeVal * propertydata,
+ const GTimeVal * propertydata,
gpointer data);
static void icon_cb (IndicateListener * listener,
IndicateListenerServer * server,
IndicateListenerIndicator * indicator,
gchar * property,
- gchar * propertydata,
+ const gchar * propertydata,
gpointer data);
static void activate_cb (ImMenuItem * self,
+ guint timestamp,
gpointer data);
static void indicator_modified_cb (IndicateListener * listener,
IndicateListenerServer * server,
@@ -172,7 +173,7 @@
/* Call back for getting icon data. It just passes it along
to the indicator so that it can visualize it. Not our problem. */
static void
-icon_cb (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, gchar * propertydata, gpointer data)
+icon_cb (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, const gchar * propertydata, gpointer data)
{
dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(data), INDICATOR_MENUITEM_PROP_ICON, propertydata);
return;
@@ -258,7 +259,7 @@
looking for. It should only be called once at the init with a new
indicator and again when the value changes. */
static void
-time_cb (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, GTimeVal * propertydata, gpointer data)
+time_cb (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, const GTimeVal * propertydata, gpointer data)
{
g_debug("Got Time info");
ImMenuItem * self = IM_MENU_ITEM(data);
@@ -290,7 +291,7 @@
/* Callback from libindicate that is for getting the sender information
on a particular indicator. */
static void
-sender_cb (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, gchar * propertydata, gpointer data)
+sender_cb (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, const gchar * propertydata, gpointer data)
{
g_debug("Got Sender Information: %s", propertydata);
ImMenuItem * self = IM_MENU_ITEM(data);
@@ -318,7 +319,7 @@
that on the menu item or just remove it if the count is gone. If
that's the case we can update time. */
static void
-count_cb (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, gchar * propertydata, gpointer data)
+count_cb (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, const gchar * propertydata, gpointer data)
{
g_debug("Got Count Information");
ImMenuItem * self = IM_MENU_ITEM(data);
@@ -357,7 +358,7 @@
this indicator should be calling for attention or not. If we are,
we need to signal that. */
static void
-attention_cb (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, gchar * propertydata, gpointer data)
+attention_cb (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, const gchar * propertydata, gpointer data)
{
g_debug("Got Attention Information");
ImMenuItem * self = IM_MENU_ITEM(data);
@@ -388,11 +389,11 @@
/* Callback when the item gets clicked on from the Messaging Menu */
static void
-activate_cb (ImMenuItem * self, gpointer data)
+activate_cb (ImMenuItem * self, guint timestamp, gpointer data)
{
ImMenuItemPrivate * priv = IM_MENU_ITEM_GET_PRIVATE(self);
- indicate_listener_display(priv->listener, priv->server, priv->indicator);
+ indicate_listener_display(priv->listener, priv->server, priv->indicator, timestamp);
}
/* Callback when a property gets modified. It figures out which one
=== modified file 'src/launcher-menu-item.c'
--- src/launcher-menu-item.c 2009-12-18 21:46:18 +0000
+++ src/launcher-menu-item.c 2010-02-05 02:13:13 +0000
@@ -51,7 +51,7 @@
static void launcher_menu_item_init (LauncherMenuItem *self);
static void launcher_menu_item_dispose (GObject *object);
static void launcher_menu_item_finalize (GObject *object);
-static void activate_cb (LauncherMenuItem * self, gpointer data);
+static void activate_cb (LauncherMenuItem * self, guint timestamp, gpointer data);
G_DEFINE_TYPE (LauncherMenuItem, launcher_menu_item, DBUSMENU_TYPE_MENUITEM);
@@ -159,7 +159,7 @@
/* When the menu item is clicked on it tries to launch
the application that is represented by the desktop file */
static void
-activate_cb (LauncherMenuItem * self, gpointer data)
+activate_cb (LauncherMenuItem * self, guint timestamp, gpointer data)
{
LauncherMenuItemPrivate * priv = LAUNCHER_MENU_ITEM_GET_PRIVATE(self);
g_return_if_fail(priv->appinfo != NULL);
