aboutsummaryrefslogtreecommitdiff
path: root/libmessaging-menu
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2012-08-21 00:49:13 -0500
committerCharles Kerr <charles.kerr@canonical.com>2012-08-21 00:49:13 -0500
commit993109acc17163354749a7a3ba4c78ca657f5b14 (patch)
treeafdc3a1810b5c167ec2a6018f1d41f00544c4856 /libmessaging-menu
parentd34fb7000e9b508b05c653b47bb60f35989c34f9 (diff)
parent91eb0b1a17c5bc9d0087fe807f373d1b8a8eb87b (diff)
downloadayatana-indicator-messages-993109acc17163354749a7a3ba4c78ca657f5b14.tar.gz
ayatana-indicator-messages-993109acc17163354749a7a3ba4c78ca657f5b14.tar.bz2
ayatana-indicator-messages-993109acc17163354749a7a3ba4c78ca657f5b14.zip
sync with lp:~larsu/indicator-messages/towards-q-redesign
Diffstat (limited to 'libmessaging-menu')
-rw-r--r--libmessaging-menu/Makefile.am2
-rw-r--r--libmessaging-menu/gtupleaction.c1
-rw-r--r--libmessaging-menu/messaging-menu.c1
3 files changed, 4 insertions, 0 deletions
diff --git a/libmessaging-menu/Makefile.am b/libmessaging-menu/Makefile.am
index 3799723..187e6dc 100644
--- a/libmessaging-menu/Makefile.am
+++ b/libmessaging-menu/Makefile.am
@@ -18,6 +18,8 @@ libmessaging_menu_la_CFLAGS = \
$(GIO_CFLAGS) \
-Wall
+libmessaging_menu_la_LDFLAGS = -export-symbols-regex="^messaging_menu_.*"
+
BUILT_SOURCES = \
indicator-messages-service.c \
indicator-messages-service.h
diff --git a/libmessaging-menu/gtupleaction.c b/libmessaging-menu/gtupleaction.c
index f9e6fd7..21bc003 100644
--- a/libmessaging-menu/gtupleaction.c
+++ b/libmessaging-menu/gtupleaction.c
@@ -312,6 +312,7 @@ g_tuple_action_class_init (GTupleActionClass *class)
static void
g_tuple_action_init (GTupleAction *action)
{
+ action->enabled = TRUE;
}
GTupleAction *
diff --git a/libmessaging-menu/messaging-menu.c b/libmessaging-menu/messaging-menu.c
index 22e4793..ea33cd6 100644
--- a/libmessaging-menu/messaging-menu.c
+++ b/libmessaging-menu/messaging-menu.c
@@ -439,6 +439,7 @@ messaging_menu_app_insert_source_action (MessagingMenuApp *app,
g_object_unref (action);
menuitem = g_menu_item_new (label, id);
+ g_menu_item_set_attribute (menuitem, "x-canonical-type", "s", "ImSourceMenuItem");
if (icon)
{
gchar *icon_name = g_icon_to_string (icon);