aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configure.ac6
-rw-r--r--debian/changelog11
-rw-r--r--debian/control8
-rw-r--r--src/app-menu-item.c6
-rw-r--r--src/im-menu-item.c21
-rw-r--r--src/launcher-menu-item.c4
6 files changed, 34 insertions, 22 deletions
diff --git a/configure.ac b/configure.ac
index cdffa27..47261ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_INIT(src/indicator-messages.c)
AC_PREREQ(2.53)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-messages, 0.3.0)
+AM_INIT_AUTOMAKE(indicator-messages, 0.3.1)
AM_MAINTAINER_MODE
@@ -29,9 +29,9 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
GTK_REQUIRED_VERSION=2.12
GIO_UNIX_REQUIRED_VERSION=2.18
PANEL_REQUIRED_VERSION=2.0.0
-INDICATE_REQUIRED_VERSION=0.2.0
+INDICATE_REQUIRED_VERSION=0.3.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
diff --git a/debian/changelog b/debian/changelog
index bf83fbc..c1cd592 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+indicator-messages (0.3.1-0ubuntu1) lucid; urgency=low
+
+ * Upstream release 0.3.1
+ * Updates for dbusmenu 0.2.2
+ * Updates for libindicate 0.3.0
+ * debian/control:
+ * dbusmenu* depends to 0.2.2
+ * libindicate* depends to 0.3.0
+
+ -- Ted Gould <ted@ubuntu.com> Thu, 04 Feb 2010 18:23:34 -0800
+
indicator-messages (0.3.0-0ubuntu1) lucid; urgency=low
* Upstream release 0.3.0
diff --git a/debian/control b/debian/control
index 6b726d4..f622dd2 100644
--- a/debian/control
+++ b/debian/control
@@ -9,11 +9,11 @@ Build-Depends: debhelper (>= 5.0),
gnome-doc-utils,
scrollkeeper,
intltool,
- libindicate-dev (>= 0.2.0),
- libindicate-gtk-dev (>= 0.2.0),
+ libindicate-dev (>= 0.3.0),
+ libindicate-gtk-dev (>= 0.3.0),
libindicator-dev (>= 0.3.0),
- libdbusmenu-gtk-dev (>= 0.2.0),
- libdbusmenu-glib-dev (>= 0.2.0)
+ libdbusmenu-gtk-dev (>= 0.2.2),
+ libdbusmenu-glib-dev (>= 0.2.2)
Standards-Version: 3.8.0
Homepage: https://launchpad.net/indicator-applet
Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-messages/ubuntu
diff --git a/src/app-menu-item.c b/src/app-menu-item.c
index aa0b60c..9c51475 100644
--- a/src/app-menu-item.c
+++ b/src/app-menu-item.c
@@ -57,7 +57,7 @@ static void app_menu_item_class_init (AppMenuItemClass *klass);
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 @@ desktop_cb (IndicateListener * listener, IndicateListenerServer * server, gchar
}
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;
}
diff --git a/src/im-menu-item.c b/src/im-menu-item.c
index 035b2da..ea9190a 100644
--- a/src/im-menu-item.c
+++ b/src/im-menu-item.c
@@ -68,21 +68,22 @@ static void sender_cb (IndicateListener * listener,
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 @@ im_menu_item_finalize (GObject *object)
/* 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 @@ time_update_cb (gpointer data)
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 @@ time_cb (IndicateListener * listener, IndicateListenerServer * server, IndicateL
/* 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 @@ sender_cb (IndicateListener * listener, IndicateListenerServer * server, Indicat
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 @@ count_cb (IndicateListener * listener, IndicateListenerServer * server, Indicate
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 @@ attention_cb (IndicateListener * listener, IndicateListenerServer * server, Indi
/* 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
diff --git a/src/launcher-menu-item.c b/src/launcher-menu-item.c
index d203bba..50e8ce6 100644
--- a/src/launcher-menu-item.c
+++ b/src/launcher-menu-item.c
@@ -51,7 +51,7 @@ static void launcher_menu_item_class_init (LauncherMenuItemClass *klass);
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 @@ launcher_menu_item_get_name (LauncherMenuItem * appitem)
/* 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);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 20:03:30 +0000