aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2011-01-27 16:59:15 -0600
committerTed Gould <ted@gould.cx>2011-01-27 16:59:15 -0600
commit66add4a6889fe7d0e4aaccf2eb170c1eda0e8a6b (patch)
tree8f7242601b5ebd0e6c7fa4d122c01927deb9102d /src
parent129064cc2748dabc53a303423838b65e96f991c4 (diff)
parent0ade6393658510b2af6b83588ddc01d3b4067643 (diff)
downloadayatana-indicator-messages-66add4a6889fe7d0e4aaccf2eb170c1eda0e8a6b.tar.gz
ayatana-indicator-messages-66add4a6889fe7d0e4aaccf2eb170c1eda0e8a6b.tar.bz2
ayatana-indicator-messages-66add4a6889fe7d0e4aaccf2eb170c1eda0e8a6b.zip
Import upstream version 0.3.91
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am18
-rw-r--r--src/Makefile.in20
-rw-r--r--src/indicator-messages.c4
3 files changed, 36 insertions, 6 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index dd09b8a..8597d77 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,7 +12,14 @@ libmessaging_la_SOURCES = \
gen-messages-service.xml.h \
gen-messages-service.xml.c \
dbus-data.h
-libmessaging_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Wl,-Bsymbolic-functions -Wl,-z,defs -Wl,--as-needed -Werror
+libmessaging_la_CFLAGS = \
+ $(APPLET_CFLAGS) \
+ -Wall \
+ -Wl,-Bsymbolic-functions \
+ -Wl,-z,defs \
+ -Wl,--as-needed \
+ -Werror \
+ -DG_LOG_DOMAIN=\"Indicator-Messages\"
libmessaging_la_LIBADD = $(APPLET_LIBS)
libmessaging_la_LDFLAGS = -module -avoid-version
@@ -38,7 +45,14 @@ indicator_messages_service_SOURCES = \
seen-db.h \
dirs.h \
dbus-data.h
-indicator_messages_service_CFLAGS = $(APPLET_CFLAGS) -Wall -Wl,-Bsymbolic-functions -Wl,-z,defs -Wl,--as-needed -Werror
+indicator_messages_service_CFLAGS = \
+ $(APPLET_CFLAGS) \
+ -Wall \
+ -Wl,-Bsymbolic-functions \
+ -Wl,-z,defs \
+ -Wl,--as-needed \
+ -Werror \
+ -DG_LOG_DOMAIN=\"Indicator-Messages\"
indicator_messages_service_LDADD = $(APPLET_LIBS)
gen-%.xml.h: %.xml
diff --git a/src/Makefile.in b/src/Makefile.in
index acc459e..c1ca548 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -289,7 +289,15 @@ libmessaging_la_SOURCES = \
gen-messages-service.xml.c \
dbus-data.h
-libmessaging_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Wl,-Bsymbolic-functions -Wl,-z,defs -Wl,--as-needed -Werror
+libmessaging_la_CFLAGS = \
+ $(APPLET_CFLAGS) \
+ -Wall \
+ -Wl,-Bsymbolic-functions \
+ -Wl,-z,defs \
+ -Wl,--as-needed \
+ -Werror \
+ -DG_LOG_DOMAIN=\"Indicator-Messages\"
+
libmessaging_la_LIBADD = $(APPLET_LIBS)
libmessaging_la_LDFLAGS = -module -avoid-version
@@ -315,7 +323,15 @@ indicator_messages_service_SOURCES = \
dirs.h \
dbus-data.h
-indicator_messages_service_CFLAGS = $(APPLET_CFLAGS) -Wall -Wl,-Bsymbolic-functions -Wl,-z,defs -Wl,--as-needed -Werror
+indicator_messages_service_CFLAGS = \
+ $(APPLET_CFLAGS) \
+ -Wall \
+ -Wl,-Bsymbolic-functions \
+ -Wl,-z,defs \
+ -Wl,--as-needed \
+ -Werror \
+ -DG_LOG_DOMAIN=\"Indicator-Messages\"
+
indicator_messages_service_LDADD = $(APPLET_LIBS)
BUILT_SOURCES = \
gen-messages-service.xml.h \
diff --git a/src/indicator-messages.c b/src/indicator-messages.c
index 6fd6c5c..8a94a85 100644
--- a/src/indicator-messages.c
+++ b/src/indicator-messages.c
@@ -489,7 +489,7 @@ numbers_draw_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data)
/* Builds a menu item representing a running application in the
messaging menu */
static gboolean
-new_application_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client)
+new_application_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client, gpointer user_data)
{
g_debug ("%s (\"%s\")", __func__, dbusmenu_menuitem_property_get(newitem, APPLICATION_MENUITEM_PROP_NAME));
@@ -597,7 +597,7 @@ indicator_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GVariant * value,
shifting over and putting the icon in with some right
side text that'll be determined by the service. */
static gboolean
-new_indicator_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client)
+new_indicator_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client, gpointer user_data)
{
g_return_val_if_fail(DBUSMENU_IS_MENUITEM(newitem), FALSE);
g_return_val_if_fail(DBUSMENU_IS_GTKCLIENT(client), FALSE);