[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk]
Status: Mature = Abandoned -- lp:indicator-messages/0.5 https://code.launchpad.net/~indicator-applet-developers/indicator-messages/trunk Your team ayatana-commits is subscribed to branch lp:indicator-messages/0.5. To unsubscribe from this branch go to https://code.launchpad.net/~indicator-applet-developers/indicator-messages/trunk/+edit-subscription ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk]
Status: Development = Mature -- lp:indicator-messages/0.5 https://code.launchpad.net/~indicator-applet-developers/indicator-messages/trunk Your team ayatana-commits is subscribed to branch lp:indicator-messages/0.5. To unsubscribe from this branch go to https://code.launchpad.net/~indicator-applet-developers/indicator-messages/trunk/+edit-subscription ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 232: 0.5.0
revno: 232 tags: 0.5.0 committer: Ted Gould t...@gould.cx branch nick: trunk timestamp: Wed 2011-09-28 10:33:24 -0500 message: 0.5.0 modified: configure.ac -- 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 2011-08-25 13:45:34 + +++ configure.ac 2011-09-28 15:33:24 + @@ -4,7 +4,7 @@ AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-messages, 0.4.95) +AM_INIT_AUTOMAKE(indicator-messages, 0.5.0) AM_MAINTAINER_MODE ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 231: Memory leak on pixbufs
Merge authors:
Chow Loong Jin (hyperair)
Related merge proposals:
https://code.launchpad.net/~ted/indicator-messages/mem-leaks/+merge/47088
proposed by: Ted Gould (ted)
review: Approve - Conor Curran (cjcurran)
revno: 231 [merge]
committer: Ted Gould t...@gould.cx
branch nick: trunk
timestamp: Wed 2011-09-21 15:14:17 -0500
message:
Memory leak on pixbufs
modified:
src/indicator-messages.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 'src/indicator-messages.c'
--- src/indicator-messages.c 2011-08-25 02:29:38 +
+++ src/indicator-messages.c 2011-09-21 20:14:17 +
@@ -653,6 +653,7 @@
width,
height,
GDK_INTERP_BILINEAR);
+g_object_unref(pixbuf);
} else {
g_debug(Happy with icon sized %dx%d, gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf));
resized_pixbuf = pixbuf;
@@ -660,10 +661,7 @@
gtk_image_set_from_pixbuf(GTK_IMAGE(mi_data-icon), resized_pixbuf);
- /* The other pixbuf should be free'd by the dbusmenu. */
- if (resized_pixbuf != pixbuf) {
-g_object_unref(resized_pixbuf);
- }
+ g_object_unref(resized_pixbuf);
gtk_widget_show(mi_data-icon);
} else {
@@ -715,6 +713,7 @@
width,
height,
GDK_INTERP_BILINEAR);
+ g_object_unref(pixbuf);
} else {
g_debug(Happy with icon sized %dx%d, gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf));
resized_pixbuf = pixbuf;
@@ -722,10 +721,7 @@
gtk_image_set_from_pixbuf(GTK_IMAGE(mi_data-icon), resized_pixbuf);
- /* The other pixbuf should be free'd by the dbusmenu. */
- if (resized_pixbuf != pixbuf) {
- g_object_unref(resized_pixbuf);
- }
+ g_object_unref(resized_pixbuf);
}
gtk_misc_set_alignment(GTK_MISC(mi_data-icon), 0.0, 0.5);
gtk_box_pack_start(GTK_BOX(hbox), mi_data-icon, FALSE, FALSE, 0);
___
Mailing list: https://launchpad.net/~ayatana-commits
Post to : ayatana-commits@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ayatana-commits
More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 229: Fix the gutters
Merge authors:
Ted Gould (ted)
Related merge proposals:
https://code.launchpad.net/~ted/indicator-messages/gutter-fix/+merge/72819
proposed by: Ted Gould (ted)
revno: 229 [merge]
committer: Ted Gould t...@gould.cx
branch nick: trunk
timestamp: Thu 2011-08-25 08:35:36 -0500
message:
Fix the gutters
modified:
src/indicator-messages.c
src/messages-service.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 'src/indicator-messages.c'
--- src/indicator-messages.c 2011-08-17 16:46:28 +
+++ src/indicator-messages.c 2011-08-25 02:29:38 +
@@ -581,11 +581,6 @@
GtkMenuItem * gmi = GTK_MENU_ITEM(gtk_image_menu_item_new());
gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM(gmi), TRUE);
- gint padding = 4;
- gtk_widget_style_get(GTK_WIDGET(gmi), horizontal-padding, padding, NULL);
-
- GtkWidget * hbox = gtk_hbox_new(FALSE, 0);
-
/* Set the minimum size, we always want it to take space */
gint width, height;
gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, width, height);
@@ -602,12 +597,10 @@
/* Application name in a label */
GtkWidget * label = gtk_label_new(dbusmenu_menuitem_property_get(newitem, APPLICATION_MENUITEM_PROP_NAME));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
- gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, padding);
gtk_widget_show(label);
/* Insert the hbox */
- gtk_container_add(GTK_CONTAINER(gmi), hbox);
- gtk_widget_show(hbox);
+ gtk_container_add(GTK_CONTAINER(gmi), label);
/* Attach some of the standard GTK stuff */
dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, gmi, parent);
@@ -698,9 +691,9 @@
gint padding = 4;
gint font_size = RIGHT_LABEL_FONT_SIZE;
- gtk_widget_style_get(GTK_WIDGET(gmi), horizontal-padding, padding, NULL);
+ gtk_widget_style_get(GTK_WIDGET(gmi), toggle-spacing, padding, NULL);
- GtkWidget * hbox = gtk_hbox_new(FALSE, 0);
+ GtkWidget * hbox = gtk_hbox_new(FALSE, padding);
/* Icon, probably someone's face or avatar on an IM */
mi_data-icon = gtk_image_new();
@@ -735,7 +728,7 @@
}
}
gtk_misc_set_alignment(GTK_MISC(mi_data-icon), 0.0, 0.5);
- gtk_box_pack_start(GTK_BOX(hbox), mi_data-icon, FALSE, FALSE, padding);
+ gtk_box_pack_start(GTK_BOX(hbox), mi_data-icon, FALSE, FALSE, 0);
if (pixbuf != NULL) {
gtk_widget_show(mi_data-icon);
@@ -744,7 +737,7 @@
/* Label, probably a username, chat room or mailbox name */
mi_data-label = gtk_label_new(dbusmenu_menuitem_property_get(newitem, INDICATOR_MENUITEM_PROP_LABEL));
gtk_misc_set_alignment(GTK_MISC(mi_data-label), 0.0, 0.5);
- gtk_box_pack_start(GTK_BOX(hbox), mi_data-label, TRUE, TRUE, padding);
+ gtk_box_pack_start(GTK_BOX(hbox), mi_data-label, TRUE, TRUE, 0);
gtk_widget_show(mi_data-label);
/* Usually either the time or the count on the individual
=== modified file 'src/messages-service.c'
--- src/messages-service.c 2011-08-19 18:36:27 +
+++ src/messages-service.c 2011-08-25 01:26:02 +
@@ -32,7 +32,6 @@
#include libdbusmenu-glib/client.h
#include libdbusmenu-glib/server.h
-#include libdbusmenu-glib/menuitem-proxy.h
#include im-menu-item.h
#include app-menu-item.h
___
Mailing list: https://launchpad.net/~ayatana-commits
Post to : ayatana-commits@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ayatana-commits
More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 228: MPT's happiness is a feature
Merge authors: Omer Akram (om26er) Related merge proposals: https://code.launchpad.net/~om26er/indicator-messages/fix-829659/+merge/72245 proposed by: Omer Akram (om26er) revno: 228 [merge] committer: Ted Gould t...@gould.cx branch nick: trunk timestamp: Mon 2011-08-22 22:31:24 -0500 message: MPT's happiness is a feature modified: src/messages-service.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 'src/messages-service.c' --- src/messages-service.c 2011-07-22 17:15:29 + +++ src/messages-service.c 2011-08-19 18:36:27 + @@ -1504,7 +1504,7 @@ /* Add in the clear attention item */ clear_attention = dbusmenu_menuitem_new(); - dbusmenu_menuitem_property_set(clear_attention, DBUSMENU_MENUITEM_PROP_LABEL, _(Clear Attention)); + dbusmenu_menuitem_property_set(clear_attention, DBUSMENU_MENUITEM_PROP_LABEL, _(Clear)); dbusmenu_menuitem_child_append(root_menuitem, clear_attention); g_signal_connect(G_OBJECT(dbus_interface), MESSAGE_SERVICE_DBUS_SIGNAL_ATTENTION_CHANGED, G_CALLBACK(clear_attention_handler), clear_attention); g_signal_connect(G_OBJECT(clear_attention), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(clear_attention_activate), dbus_interface); ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 227: 0.4.94
revno: 227 tags: 0.4.94 committer: Ted Gould t...@gould.cx branch nick: trunk timestamp: Thu 2011-08-18 10:50:07 -0500 message: 0.4.94 modified: configure.ac -- 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 2011-08-11 14:16:13 + +++ configure.ac 2011-08-18 15:50:07 + @@ -4,7 +4,7 @@ AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-messages, 0.4.93) +AM_INIT_AUTOMAKE(indicator-messages, 0.4.94) AM_MAINTAINER_MODE ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 219: 0.4.92
revno: 219 tags: 0.4.92 committer: Ted Gould t...@gould.cx branch nick: trunk timestamp: Thu 2011-07-14 13:01:07 -0500 message: 0.4.92 modified: configure.ac -- 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 2011-07-08 19:46:06 + +++ configure.ac 2011-07-14 18:01:07 + @@ -4,7 +4,7 @@ AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-messages, 0.4.91) +AM_INIT_AUTOMAKE(indicator-messages, 0.4.92) AM_MAINTAINER_MODE ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 218: Adding status menu items to the messaging menu
Merge authors: Ted Gould (ted) Related merge proposals: https://code.launchpad.net/~ted/indicator-messages/status-items/+merge/67891 proposed by: Ted Gould (ted) review: Approve - Andrea Cimitan (cimi) revno: 218 [merge] committer: Ted Gould t...@gould.cx branch nick: trunk timestamp: Thu 2011-07-14 12:59:41 -0500 message: Adding status menu items to the messaging menu added: src/indicator-messages-status-provider-0.5.pc.in.in src/status-items.c src/status-items.h src/status-provider-emesene.c src/status-provider-emesene.h src/status-provider-mc5.c src/status-provider-mc5.h src/status-provider-mc5.list src/status-provider-pidgin.c src/status-provider-pidgin.h src/status-provider-pidgin.list src/status-provider-telepathy.c src/status-provider-telepathy.h src/status-provider-telepathy.list src/status-provider.c src/status-provider.h modified: .bzrignore configure.ac po/POTFILES.in src/Makefile.am src/messages-service.c The size of the diff (2766 lines) is larger than your specified limit of 1000 lines -- 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 ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 217: 0.4.91
revno: 217 tags: 0.4.91 committer: Ted Gould t...@gould.cx branch nick: trunk timestamp: Fri 2011-07-08 09:13:51 -0500 message: 0.4.91 modified: configure.ac -- 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 2011-07-07 14:17:04 + +++ configure.ac 2011-07-08 14:13:51 + @@ -4,7 +4,7 @@ AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-messages, 0.4.90) +AM_INIT_AUTOMAKE(indicator-messages, 0.4.91) AM_MAINTAINER_MODE ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 215: Bumping to libindicator 0.4 API
revno: 215 committer: Ted Gould t...@gould.cx branch nick: trunk timestamp: Thu 2011-07-07 08:48:08 -0500 message: Bumping to libindicator 0.4 API modified: configure.ac -- 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 2011-06-21 20:01:53 + +++ configure.ac 2011-07-07 13:48:08 + @@ -52,14 +52,14 @@ AS_IF([test x$with_indicator_gtk = x3], [PKG_CHECK_MODULES(APPLET, gtk+-3.0 = $GTK3_REQUIRED_VERSION gio-unix-2.0 = $GIO_UNIX_REQUIRED_VERSION - indicator3 = $INDICATOR_REQUIRED_VERSION + indicator3-0.4 = $INDICATOR_REQUIRED_VERSION indicate-0.5 = $INDICATE_REQUIRED_VERSION dbusmenu-gtk3-0.4 = $DBUSMENUGTK_REQUIRED_VERSION) ], [test x$with_indicator_gtk = x2], [PKG_CHECK_MODULES(APPLET, gtk+-2.0 = $GTK_REQUIRED_VERSION gio-unix-2.0 = $GIO_UNIX_REQUIRED_VERSION - indicator = $INDICATOR_REQUIRED_VERSION + indicator-0.4 = $INDICATOR_REQUIRED_VERSION indicate-0.5 = $INDICATE_REQUIRED_VERSION dbusmenu-gtk-0.4 = $DBUSMENUGTK_REQUIRED_VERSION) ], ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 216: Migrate to indicator 0.4 API
revno: 216
committer: Ted Gould t...@gould.cx
branch nick: trunk
timestamp: Thu 2011-07-07 09:17:04 -0500
message:
Migrate to indicator 0.4 API
modified:
configure.ac
--
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 2011-07-07 13:48:08 +
+++ configure.ac 2011-07-07 14:17:04 +
@@ -83,11 +83,11 @@
INDICATORDIR=${libdir}/indicators/2/
INDICATORICONSDIR=${datadir}/libindicate/icons/
elif test x$with_indicator_gtk = x2; then
- INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator`
- INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator`
+ INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator-0.4`
+ INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator-0.4`
else
- INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3`
- INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3`
+ INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4`
+ INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3-0.4`
fi
AC_SUBST(INDICATORDIR)
AC_SUBST(INDICATORICONSDIR)
___
Mailing list: https://launchpad.net/~ayatana-commits
Post to : ayatana-commits@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ayatana-commits
More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 214: 0.4.90
revno: 214 tags: 0.4.90 committer: Ted Gould t...@gould.cx branch nick: trunk timestamp: Tue 2011-06-21 15:01:53 -0500 message: 0.4.90 modified: configure.ac -- 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 2011-05-26 17:26:39 + +++ configure.ac 2011-06-21 20:01:53 + @@ -4,7 +4,7 @@ AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-messages, 0.4.0) +AM_INIT_AUTOMAKE(indicator-messages, 0.4.90) AM_MAINTAINER_MODE ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 213: GTK3 Changes
Merge authors:
Michael Terry (mterry)
Related merge proposals:
https://code.launchpad.net/~mterry/indicator-messages/gtk3/+merge/62527
proposed by: Michael Terry (mterry)
review: Approve - Ted Gould (ted)
revno: 213 [merge]
committer: Ted Gould t...@gould.cx
branch nick: trunk
timestamp: Fri 2011-06-10 14:41:51 -0500
message:
GTK3 Changes
modified:
configure.ac
src/indicator-messages.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 2011-04-07 17:10:43 +
+++ configure.ac 2011-05-26 17:26:39 +
@@ -36,17 +36,35 @@
###
GTK_REQUIRED_VERSION=2.12
+GTK3_REQUIRED_VERSION=3.0
GIO_UNIX_REQUIRED_VERSION=2.18
PANEL_REQUIRED_VERSION=2.0.0
INDICATE_REQUIRED_VERSION=0.4.90
INDICATOR_REQUIRED_VERSION=0.3.19
DBUSMENUGTK_REQUIRED_VERSION=0.3.94
-PKG_CHECK_MODULES(APPLET, gtk+-2.0 = $GTK_REQUIRED_VERSION
- gio-unix-2.0 = $GIO_UNIX_REQUIRED_VERSION
- indicator = $INDICATOR_REQUIRED_VERSION
- indicate-0.5 = $INDICATE_REQUIRED_VERSION
- dbusmenu-gtk-0.4 = $DBUSMENUGTK_REQUIRED_VERSION)
+AC_ARG_WITH([indicator-gtk],
+ [AS_HELP_STRING([--with-indicator-gtk],
+[Which version of gtk to use for the indicator @:@default=3@:@])],
+ [],
+ [with_indicator_gtk=3])
+
+AS_IF([test x$with_indicator_gtk = x3],
+[PKG_CHECK_MODULES(APPLET, gtk+-3.0 = $GTK3_REQUIRED_VERSION
+ gio-unix-2.0 = $GIO_UNIX_REQUIRED_VERSION
+ indicator3 = $INDICATOR_REQUIRED_VERSION
+ indicate-0.5 = $INDICATE_REQUIRED_VERSION
+ dbusmenu-gtk3-0.4 = $DBUSMENUGTK_REQUIRED_VERSION)
+],
+ [test x$with_indicator_gtk = x2],
+[PKG_CHECK_MODULES(APPLET, gtk+-2.0 = $GTK_REQUIRED_VERSION
+ gio-unix-2.0 = $GIO_UNIX_REQUIRED_VERSION
+ indicator = $INDICATOR_REQUIRED_VERSION
+ indicate-0.5 = $INDICATE_REQUIRED_VERSION
+ dbusmenu-gtk-0.4 = $DBUSMENUGTK_REQUIRED_VERSION)
+],
+ [AC_MSG_FAILURE([Value for --with-indicator-gtk was neither 2 nor 3])]
+)
AC_SUBST(APPLET_CFLAGS)
AC_SUBST(APPLET_LIBS)
@@ -64,9 +82,12 @@
if test x$with_localinstall = xyes; then
INDICATORDIR=${libdir}/indicators/2/
INDICATORICONSDIR=${datadir}/libindicate/icons/
-else
+elif test x$with_indicator_gtk = x2; then
INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator`
INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator`
+else
+ INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3`
+ INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3`
fi
AC_SUBST(INDICATORDIR)
AC_SUBST(INDICATORICONSDIR)
=== modified file 'src/indicator-messages.c'
--- src/indicator-messages.c 2011-02-17 18:04:32 +
+++ src/indicator-messages.c 2011-05-26 17:26:39 +
@@ -25,8 +25,14 @@
#include glib-object.h
#include glib/gi18n.h
#include gtk/gtk.h
+
+#if GTK_CHECK_VERSION(3, 0, 0)
+#include libdbusmenu-gtk3/menu.h
+#include libdbusmenu-gtk3/menuitem.h
+#else
#include libdbusmenu-gtk/menu.h
#include libdbusmenu-gtk/menuitem.h
+#endif
#include libindicator/indicator.h
#include libindicator/indicator-object.h
___
Mailing list: https://launchpad.net/~ayatana-commits
Post to : ayatana-commits@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ayatana-commits
More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 211: Add support for a specific icon on the menu
Merge authors:
Ted Gould (ted)
Related merge proposals:
https://code.launchpad.net/~ted/indicator-messages/specific-icon/+merge/56623
proposed by: Ted Gould (ted)
review: Approve - Kalle Valo (kvalo)
revno: 211 [merge]
committer: Ted Gould t...@gould.cx
branch nick: trunk
timestamp: Wed 2011-04-06 16:43:21 -0500
message:
Add support for a specific icon on the menu
modified:
src/app-menu-item.c
src/default-applications.h
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 'src/app-menu-item.c'
--- src/app-menu-item.c 2011-01-14 19:35:21 +
+++ src/app-menu-item.c 2011-04-06 16:24:05 +
@@ -52,6 +52,7 @@
gchar * type;
GAppInfo * appinfo;
+ GKeyFile * keyfile;
gchar * desktop;
guint unreadcount;
@@ -129,6 +130,7 @@
priv-server = NULL;
priv-type = NULL;
priv-appinfo = NULL;
+ priv-keyfile = NULL;
priv-desktop = NULL;
priv-unreadcount = 0;
@@ -179,6 +181,16 @@
priv-client = NULL;
}
+ if (priv-appinfo != NULL) {
+ g_object_unref(priv-appinfo);
+ priv-appinfo = NULL;
+ }
+
+ if (priv-keyfile != NULL) {
+ g_object_unref(priv-keyfile);
+ priv-keyfile = NULL;
+ }
+
G_OBJECT_CLASS (app_menu_item_parent_class)-dispose (object);
}
@@ -192,14 +204,12 @@
if (priv-type != NULL) {
g_free(priv-type);
+ priv-type = NULL;
}
if (priv-desktop != NULL) {
g_free(priv-desktop);
- }
-
- if (priv-appinfo != NULL) {
- g_object_unref(priv-appinfo);
+ priv-desktop = NULL;
}
G_OBJECT_CLASS (app_menu_item_parent_class)-finalize (object);
@@ -298,7 +308,7 @@
/* Callback for when we ask the server for the path
to it's desktop file. We then turn it into an
app structure and start sucking data out of it.
- Mostly the name. */
+ Mostly the name. And the icon. */
static void
desktop_cb (IndicateListener * listener, IndicateListenerServer * server, const gchar * value, gpointer data)
{
@@ -325,6 +335,9 @@
priv-appinfo = G_APP_INFO(g_desktop_app_info_new_from_filename(value));
g_return_if_fail(priv-appinfo != NULL);
+ priv-keyfile = g_key_file_new();
+ g_key_file_load_from_file(priv-keyfile, value, G_KEY_FILE_NONE, NULL);
+
priv-desktop = g_strdup(value);
dbusmenu_menuitem_property_set_bool(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE);
@@ -334,8 +347,28 @@
const gchar * def_icon = get_default_icon(priv-desktop);
if (def_icon == NULL) {
- GIcon * icon = g_app_info_get_icon(priv-appinfo);
- gchar * iconstr = g_icon_to_string(icon);
+ gchar * iconstr = NULL;
+
+ /* Check for the over ride key and see if we should be using that
+ icon. If we can't get it, then go back to the app info */
+ if (g_key_file_has_key(priv-keyfile, G_KEY_FILE_DESKTOP_GROUP, ICON_KEY, NULL) iconstr == NULL) {
+ GError * error = NULL;
+
+ iconstr = g_key_file_get_string(priv-keyfile, G_KEY_FILE_DESKTOP_GROUP, ICON_KEY, error);
+
+ if (error != NULL) {
+/* Can't figure out why this would happen, but sure, let's print something */
+g_warning(Error getting ' ICON_KEY ' from desktop file: %s, error-message);
+g_error_free(error);
+ }
+ }
+
+ /* For some reason that didn't work, let's try the app info */
+ if (iconstr == NULL) {
+ GIcon * icon = g_app_info_get_icon(priv-appinfo);
+ iconstr = g_icon_to_string(icon);
+ }
+
dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), APPLICATION_MENUITEM_PROP_ICON, iconstr);
g_free(iconstr);
} else {
=== modified file 'src/default-applications.h'
--- src/default-applications.h 2010-03-04 20:27:29 +
+++ src/default-applications.h 2011-04-06 16:20:08 +
@@ -22,6 +22,10 @@
#ifndef DEFAULT_APPLICATIONS_H__
#define DEFAULT_APPLICATIONS_H__ 1
+/* Used for override icons in the normal case, but didn't
+ have a better place to put it. */
+#define ICON_KEY X-Ayatana-Messaging-Menu-Icon
+
const gchar * get_default_name (const gchar * desktop_path);
const gchar * get_default_setup (const gchar * desktop_path);
const gchar * get_default_icon (const gchar * desktop_path);
=== modified file 'src/launcher-menu-item.c'
--- src/launcher-menu-item.c 2011-02-23 20:46:22 +
+++ src/launcher-menu-item.c 2011-04-06 16:20:08 +
@@ -44,6 +44,7 @@
struct _LauncherMenuItemPrivate
{
GAppInfo * appinfo;
+ GKeyFile * keyfile;
gchar * desktop;
IndicatorDesktopShortcuts * ids;
GList * shortcuts;
@@ -93,6 +94,7 @@
priv-appinfo = NULL;
priv-desktop = NULL;
+ priv-keyfile = NULL;
priv-ids = NULL;
priv-shortcuts = NULL;
@@ -120,6 +122,11 @@
priv-appinfo = NULL;
}
+ if (priv-keyfile != NULL) {
+ g_object_unref(priv-keyfile);
+ priv-keyfile = NULL;
+ }
+
if
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 210: Set the type before the other variables
Merge authors: Ted Gould (ted) Related merge proposals: https://code.launchpad.net/~ted/indicator-messages/funky-fix/+merge/51000 proposed by: Ted Gould (ted) review: Approve - Kalle Valo (kvalo) revno: 210 [merge] committer: Ted Gould t...@gould.cx branch nick: trunk timestamp: Thu 2011-02-24 08:15:17 -0600 message: Set the type before the other variables modified: 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 'src/launcher-menu-item.c' --- src/launcher-menu-item.c 2010-08-26 19:31:18 + +++ src/launcher-menu-item.c 2011-02-23 20:46:22 + @@ -97,6 +97,8 @@ priv-ids = NULL; priv-shortcuts = NULL; + dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_TYPE, APPLICATION_MENUITEM_TYPE); + return; } ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 209: 0.3.92
revno: 209 tags: 0.3.92 committer: Ted Gould t...@gould.cx branch nick: trunk timestamp: Thu 2011-02-17 12:09:26 -0600 message: 0.3.92 modified: configure.ac -- 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 2011-02-17 18:00:02 + +++ configure.ac 2011-02-17 18:09:26 + @@ -4,7 +4,7 @@ AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-messages, 0.3.91) +AM_INIT_AUTOMAKE(indicator-messages, 0.3.92) AM_MAINTAINER_MODE ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 208: Support for accessiable descriptions of the indicator
Merge authors:
Luke Yelavich (themuso)
Ted Gould (ted)
Related merge proposals:
https://code.launchpad.net/~themuso/indicator-messages/accessible-desc/+merge/49745
proposed by: Luke Yelavich (themuso)
review: Resubmit - Luke Yelavich (themuso)
review: Needs Fixing - Ted Gould (ted)
revno: 208 [merge]
committer: Ted Gould t...@gould.cx
branch nick: trunk
timestamp: Thu 2011-02-17 12:05:34 -0600
message:
Support for accessiable descriptions of the indicator
modified:
configure.ac
src/indicator-messages.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 2011-01-27 22:57:19 +
+++ configure.ac 2011-02-17 18:00:02 +
@@ -39,7 +39,7 @@
GIO_UNIX_REQUIRED_VERSION=2.18
PANEL_REQUIRED_VERSION=2.0.0
INDICATE_REQUIRED_VERSION=0.4.90
-INDICATOR_REQUIRED_VERSION=0.3.5
+INDICATOR_REQUIRED_VERSION=0.3.19
DBUSMENUGTK_REQUIRED_VERSION=0.3.94
PKG_CHECK_MODULES(APPLET, gtk+-2.0 = $GTK_REQUIRED_VERSION
=== modified file 'src/indicator-messages.c'
--- src/indicator-messages.c 2011-01-27 22:57:04 +
+++ src/indicator-messages.c 2011-02-17 18:04:32 +
@@ -23,6 +23,7 @@
#include string.h
#include glib.h
#include glib-object.h
+#include glib/gi18n.h
#include gtk/gtk.h
#include libdbusmenu-gtk/menu.h
#include libdbusmenu-gtk/menuitem.h
@@ -52,6 +53,7 @@
struct _IndicatorMessagesClass {
IndicatorObjectClass parent_class;
+ void(*update_a11y_desc) (IndicatorServiceManager * service, gpointer * user_data);
};
struct _IndicatorMessages {
@@ -71,6 +73,8 @@
static GtkSizeGroup * indicator_right_group = NULL;
static GDBusNodeInfo *bus_node_info = NULL;
static GDBusInterfaceInfo * bus_interface_info = NULL;
+static const gchar * accessible_desc = NULL;
+static IndicatorObject * indicator = NULL;
/* Prototypes */
static void indicator_messages_class_init (IndicatorMessagesClass *klass);
@@ -79,12 +83,34 @@
static void indicator_messages_finalize (GObject *object);
static GtkImage * get_icon(IndicatorObject * io);
static GtkMenu * get_menu (IndicatorObject * io);
+static const gchar * get_accessible_desc (IndicatorObject * io);
static void connection_change (IndicatorServiceManager * sm,
gboolean connected,
gpointer user_data);
G_DEFINE_TYPE (IndicatorMessages, indicator_messages, INDICATOR_OBJECT_TYPE);
+static void
+update_a11y_desc (void)
+{
+ g_return_if_fail(IS_INDICATOR_MESSAGES(indicator));
+
+ GList *entries = indicator_object_get_entries(indicator);
+ IndicatorObjectEntry * entry = (IndicatorObjectEntry *)entries-data;
+
+ entry-accessible_desc = get_accessible_desc(indicator);
+
+ g_signal_emit(G_OBJECT(indicator),
+ INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE_ID,
+ 0,
+ entry,
+ TRUE);
+
+ g_list_free(entries);
+
+ return;
+}
+
/* Initialize the one-timers */
static void
indicator_messages_class_init (IndicatorMessagesClass *klass)
@@ -98,6 +124,7 @@
io_class-get_image = get_icon;
io_class-get_menu = get_menu;
+ io_class-get_accessible_desc = get_accessible_desc;
if (bus_node_info == NULL) {
GError * error = NULL;
@@ -131,6 +158,8 @@
self-service = indicator_service_manager_new_version(INDICATOR_MESSAGES_DBUS_NAME, 1);
g_signal_connect(self-service, INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connection_change), self);
+ indicator = INDICATOR_OBJECT(self);
+
return;
}
@@ -172,8 +201,10 @@
if (g_strcmp0(AttentionChanged, signal) == 0) {
if (prop) {
indicator_image_helper_update(GTK_IMAGE(main_image), indicator-messages-new);
+ accessible_desc = _(New Messages);
} else {
indicator_image_helper_update(GTK_IMAGE(main_image), indicator-messages);
+ accessible_desc = _(Messages);
}
} else if (g_strcmp0(IconChanged, signal) == 0) {
if (prop) {
@@ -185,6 +216,8 @@
g_warning(Unknown signal %s, signal);
}
+ update_a11y_desc();
+
return;
}
@@ -205,10 +238,14 @@
if (prop) {
indicator_image_helper_update(GTK_IMAGE(main_image), indicator-messages-new);
+ accessible_desc = _(New Messages);
} else {
indicator_image_helper_update(GTK_IMAGE(main_image), indicator-messages);
+ accessible_desc = _(Messages);
}
+ update_a11y_desc();
+
return;
}
@@ -705,3 +742,10 @@
return GTK_MENU(menu);
}
+
+/* Returns the accessible description of the indicator */
+static const gchar *
+get_accessible_desc (IndicatorObject * io)
+{
+ return accessible_desc;
+}
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 206: Upgrading to new type handler prototype
revno: 206
committer: Ted Gould t...@gould.cx
branch nick: trunk
timestamp: Thu 2011-01-27 16:57:04 -0600
message:
Upgrading to new type handler prototype
modified:
configure.ac
src/indicator-messages.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 2011-01-14 20:22:31 +
+++ configure.ac 2011-01-27 22:57:04 +
@@ -40,7 +40,7 @@
PANEL_REQUIRED_VERSION=2.0.0
INDICATE_REQUIRED_VERSION=0.4.90
INDICATOR_REQUIRED_VERSION=0.3.5
-DBUSMENUGTK_REQUIRED_VERSION=0.3.90
+DBUSMENUGTK_REQUIRED_VERSION=0.3.94
PKG_CHECK_MODULES(APPLET, gtk+-2.0 = $GTK_REQUIRED_VERSION
gio-unix-2.0 = $GIO_UNIX_REQUIRED_VERSION
=== modified file 'src/indicator-messages.c'
--- src/indicator-messages.c 2011-01-14 19:10:10 +
+++ src/indicator-messages.c 2011-01-27 22:57:04 +
@@ -489,7 +489,7 @@
/* 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 @@
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);
___
Mailing list: https://launchpad.net/~ayatana-commits
Post to : ayatana-commits@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ayatana-commits
More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 205: Grabbing Ken's branch too!
Merge authors: Ken VanDine (ken-vandine) Related merge proposals: https://code.launchpad.net/~ken-vandine/indicator-messages/com_canonical/+merge/46342 proposed by: Ken VanDine (ken-vandine) review: Approve - Ted Gould (ted) revno: 205 [merge] committer: Ted Gould t...@gould.cx branch nick: trunk timestamp: Wed 2011-01-26 20:26:01 -0600 message: Grabbing Ken's branch too! -- 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 ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 204: Adding a log domain and fixing service file.
Merge authors: Ted Gould (ted) Related merge proposals: https://code.launchpad.net/~ted/indicator-messages/log-and-name/+merge/46511 proposed by: Ted Gould (ted) review: Approve - Mikkel Kamstrup Erlandsen (kamstrup) revno: 204 [merge] committer: Ted Gould t...@gould.cx branch nick: trunk timestamp: Tue 2011-01-18 12:12:54 -0600 message: Adding a log domain and fixing service file. modified: .bzrignore data/indicator-messages.service.in src/Makefile.am -- 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 '.bzrignore' --- .bzrignore 2010-03-04 21:14:24 + +++ .bzrignore 2011-01-17 18:05:20 + @@ -23,3 +23,5 @@ src/messages-service-server.h po/indicator-messages.pot src/libmessaging_la-app-gtk-menu-item.lo +src/gen-messages-service.xml.c +src/gen-messages-service.xml.h === modified file 'data/indicator-messages.service.in' --- data/indicator-messages.service.in 2009-09-09 14:52:36 + +++ data/indicator-messages.service.in 2011-01-17 18:02:17 + @@ -1,3 +1,3 @@ [D-BUS Service] -Name=org.ayatana.indicator.messages +Name=com.canonical.indicator.messages Exec=@libexecdir@/indicator-messages-service === modified file 'src/Makefile.am' --- src/Makefile.am 2011-01-14 18:33:06 + +++ src/Makefile.am 2011-01-17 18:04:11 + @@ -12,7 +12,14 @@ 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 @@ 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 ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 202: ayatana.org to canonical.com
Merge authors: Ted Gould (ted) Related merge proposals: https://code.launchpad.net/~ted/indicator-messages/com-canonical/+merge/46324 proposed by: Ted Gould (ted) review: Approve - Conor Curran (cjcurran) revno: 202 [merge] committer: Ted Gould t...@gould.cx branch nick: trunk timestamp: Fri 2011-01-14 14:20:04 -0600 message: ayatana.org to canonical.com modified: src/dbus-data.h src/messages-service.xml -- 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 'src/dbus-data.h' --- src/dbus-data.h 2010-08-26 19:31:18 + +++ src/dbus-data.h 2011-01-14 20:19:48 + @@ -2,11 +2,11 @@ #ifndef __DBUS_DATA_H__ #define __DBUS_DATA_H__ 1 -#define INDICATOR_MESSAGES_DBUS_NAME org.ayatana.indicator.messages -#define INDICATOR_MESSAGES_DBUS_OBJECT /org/ayatana/indicator/messages/menu +#define INDICATOR_MESSAGES_DBUS_NAME com.canonical.indicator.messages +#define INDICATOR_MESSAGES_DBUS_OBJECT /com/canonical/indicator/messages/menu -#define INDICATOR_MESSAGES_DBUS_SERVICE_OBJECT /org/ayatana/indicator/messages/service -#define INDICATOR_MESSAGES_DBUS_SERVICE_INTERFACE org.ayatana.indicator.messages.service +#define INDICATOR_MESSAGES_DBUS_SERVICE_OBJECT /com/canonical/indicator/messages/service +#define INDICATOR_MESSAGES_DBUS_SERVICE_INTERFACE com.canonical.indicator.messages.service #define APPLICATION_MENUITEM_TYPEapplication-item #define APPLICATION_MENUITEM_PROP_NAME label === modified file 'src/messages-service.xml' --- src/messages-service.xml 2009-08-26 02:40:35 + +++ src/messages-service.xml 2011-01-14 20:19:48 + @@ -1,6 +1,6 @@ ?xml version=1.0 encoding=UTF-8? node name=/ - interface name=org.ayatana.indicator.messages.service + interface name=com.canonical.indicator.messages.service !-- Methods -- method name=Watch ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 201: Switching dbusmenu and indicator messages
Merge authors: Ted Gould (ted) Related merge proposals: https://code.launchpad.net/~ted/indicator-messages/new-dbusmenu/+merge/46319 proposed by: Ted Gould (ted) review: Approve - Conor Curran (cjcurran) revno: 201 [merge] committer: Ted Gould t...@gould.cx branch nick: trunk timestamp: Fri 2011-01-14 14:12:22 -0600 message: Switching dbusmenu and indicator messages modified: configure.ac src/Makefile.am src/app-menu-item.c src/im-menu-item.c src/indicator-messages.c src/messages-service-dbus.c src/messages-service.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-10-06 18:58:05 + +++ configure.ac 2011-01-14 18:27:40 + @@ -38,15 +38,15 @@ GTK_REQUIRED_VERSION=2.12 GIO_UNIX_REQUIRED_VERSION=2.18 PANEL_REQUIRED_VERSION=2.0.0 -INDICATE_REQUIRED_VERSION=0.3.0 +INDICATE_REQUIRED_VERSION=0.4.90 INDICATOR_REQUIRED_VERSION=0.3.5 -DBUSMENUGTK_REQUIRED_VERSION=0.2.8 +DBUSMENUGTK_REQUIRED_VERSION=0.3.90 PKG_CHECK_MODULES(APPLET, gtk+-2.0 = $GTK_REQUIRED_VERSION gio-unix-2.0 = $GIO_UNIX_REQUIRED_VERSION indicator = $INDICATOR_REQUIRED_VERSION - indicate = $INDICATE_REQUIRED_VERSION - dbusmenu-gtk = $DBUSMENUGTK_REQUIRED_VERSION) + indicate-0.5 = $INDICATE_REQUIRED_VERSION + dbusmenu-gtk-0.4 = $DBUSMENUGTK_REQUIRED_VERSION) AC_SUBST(APPLET_CFLAGS) AC_SUBST(APPLET_LIBS) === modified file 'src/Makefile.am' --- src/Makefile.am 2010-03-25 01:26:43 + +++ src/Makefile.am 2011-01-14 18:33:06 + @@ -9,7 +9,8 @@ messaginglib_LTLIBRARIES = libmessaging.la libmessaging_la_SOURCES = \ indicator-messages.c \ - messages-service-client.h \ + 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_LIBADD = $(APPLET_LIBS) @@ -23,9 +24,10 @@ default-applications.h \ default-applications.c \ messages-service.c \ - messages-service-server.h \ messages-service-dbus.c \ messages-service-dbus.h \ + gen-messages-service.xml.h \ + gen-messages-service.xml.c \ im-menu-item.c \ im-menu-item.h \ app-menu-item.c \ @@ -39,23 +41,19 @@ indicator_messages_service_CFLAGS = $(APPLET_CFLAGS) -Wall -Wl,-Bsymbolic-functions -Wl,-z,defs -Wl,--as-needed -Werror indicator_messages_service_LDADD = $(APPLET_LIBS) -messages-service-client.h: $(srcdir)/messages-service.xml - dbus-binding-tool \ - --prefix=_messages_service_client \ - --mode=glib-client \ - --output=messages-service-client.h \ - $(srcdir)/messages-service.xml +gen-%.xml.h: %.xml + @echo Building $@ from $ + @echo extern const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $; $@ -messages-service-server.h: $(srcdir)/messages-service.xml - dbus-binding-tool \ - --prefix=_messages_service_server \ - --mode=glib-server \ - --output=messages-service-server.h \ - $(srcdir)/messages-service.xml +gen-%.xml.c: %.xml + @echo Building $@ from $ + echo const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $ = $@ + @sed -e s:\:\:g -e s:^:\: -e s:\$$:n\: $ $@ + @echo ; $@ BUILT_SOURCES = \ - messages-service-client.h \ - messages-service-server.h + gen-messages-service.xml.h \ + gen-messages-service.xml.c CLEANFILES = \ $(BUILT_SOURCES) === modified file 'src/app-menu-item.c' --- src/app-menu-item.c 2010-08-26 19:31:18 + +++ src/app-menu-item.c 2011-01-14 19:35:21 + @@ -70,8 +70,8 @@ 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 menu_cb (IndicateListener * listener, IndicateListenerServer * server, gchar * menupath, gpointer data); -static void desktop_cb (IndicateListener * listener, IndicateListenerServer * server, gchar * value, gpointer data); +static void menu_cb (IndicateListener * listener, IndicateListenerServer * server, const gchar * menupath, gpointer data); +static void desktop_cb (IndicateListener * listener, IndicateListenerServer * server, const gchar * value, gpointer data); static void update_label (AppMenuItem * self); /* GObject Boilerplate */ @@ -300,7 +300,7 @@ app structure and start sucking data out of it. Mostly the name. */ static void -desktop_cb (IndicateListener * listener,
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 203: 0.3.90
revno: 203 tags: 0.3.90 committer: Ted Gould t...@gould.cx branch nick: trunk timestamp: Fri 2011-01-14 14:22:31 -0600 message: 0.3.90 modified: configure.ac -- 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 2011-01-14 18:27:40 + +++ configure.ac 2011-01-14 20:22:31 + @@ -4,7 +4,7 @@ AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-messages, 0.3.11) +AM_INIT_AUTOMAKE(indicator-messages, 0.3.90) AM_MAINTAINER_MODE ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 200: Fix deprecations and ensure they're part of distcheck
Merge authors:
Michael Terry (mterry)
revno: 200 [merge]
committer: Ted Gould t...@gould.cx
branch nick: trunk
timestamp: Fri 2010-10-08 16:13:11 -0600
message:
Fix deprecations and ensure they're part of distcheck
modified:
Makefile.am
configure.ac
src/indicator-messages.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 'Makefile.am'
--- Makefile.am 2010-09-21 21:10:56 +
+++ Makefile.am 2010-10-08 22:13:11 +
@@ -4,7 +4,7 @@
data \
po
-DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
+DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall --enable-deprecations
dist-hook:
@if test -d $(top_srcdir)/.bzr; \
=== modified file 'configure.ac'
--- configure.ac 2010-09-09 18:10:37 +
+++ configure.ac 2010-10-06 18:58:05 +
@@ -22,6 +22,15 @@
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+AC_ARG_ENABLE([deprecations],
+ [AS_HELP_STRING([--enable-deprecations],
+[allow deprecated API usage @:@default=yes@:@])],
+ [],
+ [enable_deprecations=yes])
+AS_IF([test x$enable_deprecations = xno],
+ [CFLAGS=$CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE -DGTK_DISABLE_SINGLE_INCLUDES]
+)
+
###
# Dependencies
###
=== modified file 'src/indicator-messages.c'
--- src/indicator-messages.c 2010-09-03 18:13:16 +
+++ src/indicator-messages.c 2010-10-06 18:58:05 +
@@ -299,6 +299,7 @@
static gboolean
application_triangle_draw_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data)
{
+ GtkAllocation allocation;
GtkStyle *style;
cairo_t *cr;
int x, y, arrow_width, arrow_height;
@@ -316,11 +317,12 @@
/* set arrow position / dimensions */
arrow_width = 5; /* the pixel-based reference triangle is 5x9 */
arrow_height = 9;
- x = widget-allocation.x;
- y = widget-allocation.y + widget-allocation.height/2.0 - (double)arrow_height/2.0;
+ gtk_widget_get_allocation (widget, allocation);
+ x = allocation.x;
+ y = allocation.y + allocation.height/2.0 - (double)arrow_height/2.0;
/* initialize cairo drawing area */
- cr = (cairo_t*) gdk_cairo_create (widget-window);
+ cr = (cairo_t*) gdk_cairo_create (gtk_widget_get_window (widget));
/* set line width */
cairo_set_line_width (cr, 1.0);
@@ -359,6 +361,7 @@
static gboolean
numbers_draw_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data)
{
+ GtkAllocation allocation;
GtkStyle *style;
cairo_t *cr;
double x, y, w, h;
@@ -371,10 +374,11 @@
style = gtk_widget_get_style (widget);
/* set arrow position / dimensions */
- w = widget-allocation.width;
- h = widget-allocation.height;
- x = widget-allocation.x;
- y = widget-allocation.y;
+ gtk_widget_get_allocation (widget, allocation);
+ w = allocation.width;
+ h = allocation.height;
+ x = allocation.x;
+ y = allocation.y;
layout = gtk_label_get_layout (GTK_LABEL(widget));
@@ -385,7 +389,7 @@
font_size = pango_font_description_get_size (font_description); */
/* initialize cairo drawing area */
- cr = (cairo_t*) gdk_cairo_create (widget-window);
+ cr = (cairo_t*) gdk_cairo_create (gtk_widget_get_window (widget));
/* set line width */
cairo_set_line_width (cr, 1.0);
___
Mailing list: https://launchpad.net/~ayatana-commits
Post to : ayatana-commits@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ayatana-commits
More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 199: Building ChangeLog and AUTHORS from makefile
revno: 199 committer: Ted Gould t...@gould.cx branch nick: trunk timestamp: Tue 2010-09-21 16:10:56 -0500 message: Building ChangeLog and AUTHORS from makefile modified: AUTHORS ChangeLog Makefile.am -- 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 'AUTHORS' --- AUTHORS 2009-02-11 22:05:18 + +++ AUTHORS 2010-09-21 21:10:56 + @@ -1,1 +1,2 @@ -Ted Gould t...@canonical.com +# Generated by Makefile + === modified file 'ChangeLog' --- ChangeLog 2008-12-05 03:13:41 + +++ ChangeLog 2010-09-21 21:10:56 + @@ -0,0 +1,2 @@ +# Generated by Makefile + === modified file 'Makefile.am' --- Makefile.am 2009-09-15 21:06:55 + +++ Makefile.am 2010-09-21 21:10:56 + @@ -6,3 +6,28 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall +dist-hook: + @if test -d $(top_srcdir)/.bzr; \ + then \ + echo Creating ChangeLog \ +( cd $(top_srcdir) \ +echo '# Generated by Makefile. Do not edit.'; echo; \ +$(top_srcdir)/missing --run bzr log --gnu-changelog ) ChangeLog.tmp \ + mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \ +|| (rm -f ChangeLog.tmp; \ + echo Failed to generate ChangeLog 2 ); \ +else \ + echo Failed to generate ChangeLog: not a branch 2; \ + fi + @if test -d $(top_srcdir)/.bzr; \ + then \ + echo Creating AUTHORS \ +( cd $(top_srcdir) \ +echo '# Generated by Makefile. Do not edit.'; echo; \ +$(top_srcdir)/missing --run bzr log --long --levels=0 | grep -e ^\s*author: -e ^\s*committer: | cut -d : -f 2 | cut -d -f 1 | sort -u) AUTHORS.tmp \ + mv -f AUTHORS.tmp $(top_distdir)/AUTHORS \ +|| (rm -f AUTHORS.tmp; \ + echo Failed to generate AUTHORS 2 ); \ +else \ + echo Failed to generate AUTHORS: not a branch 2; \ + fi ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 198: 0.3.11
revno: 198 tags: 0.3.11 committer: Ted Gould t...@gould.cx branch nick: trunk timestamp: Thu 2010-09-09 13:10:37 -0500 message: 0.3.11 modified: configure.ac -- 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-08-26 20:03:47 + +++ configure.ac 2010-09-09 18:10:37 + @@ -4,7 +4,7 @@ AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-messages, 0.3.10) +AM_INIT_AUTOMAKE(indicator-messages, 0.3.11) AM_MAINTAINER_MODE ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 193: Removing the parenthesis
revno: 193 committer: Ted Gould t...@gould.cx branch nick: trunk timestamp: Thu 2010-08-12 09:25:35 -0500 message: Removing the parenthesis modified: src/im-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 'src/im-menu-item.c' --- src/im-menu-item.c 2010-03-12 16:07:07 + +++ src/im-menu-item.c 2010-08-12 14:25:35 + @@ -348,7 +348,7 @@ g_free(priv-count); } - priv-count = g_strdup_printf((%s), propertydata); + priv-count = g_strdup_printf(%s, propertydata); dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), INDICATOR_MENUITEM_PROP_RIGHT, priv-count); return; ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 194: 0.3.9
revno: 194 tags: 0.3.9 committer: Ted Gould t...@gould.cx branch nick: trunk timestamp: Thu 2010-08-12 12:56:58 -0500 message: 0.3.9 modified: configure.ac -- 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-07-29 16:50:05 + +++ configure.ac 2010-08-12 17:56:58 + @@ -4,7 +4,7 @@ AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-messages, 0.3.8) +AM_INIT_AUTOMAKE(indicator-messages, 0.3.9) AM_MAINTAINER_MODE ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 190: message counters are now rendered with a nice rounded background
Merge authors:
Andrea Cimitan (cimi)
Andrea Cimitan c...@gemini
Related merge proposals:
https://code.launchpad.net/~cimi/indicator-messages/right-rounded-numbers/+merge/31262
proposed by: Andrea Cimitan (cimi)
review: Approve - David Barth (dbarth)
https://code.launchpad.net/~cimi/indicator-messages/new-triangles-and-right-info/+merge/30634
proposed by: David Barth (dbarth)
revno: 190 [merge]
committer: David Barth david.ba...@canonical.com
branch nick: indicator-messages
timestamp: Thu 2010-07-29 13:46:51 +0200
message:
message counters are now rendered with a nice rounded background
modified:
src/indicator-messages.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 'src/indicator-messages.c'
--- src/indicator-messages.c 2010-03-31 05:24:02 +
+++ src/indicator-messages.c 2010-07-29 11:40:02 +
@@ -44,6 +44,11 @@
#define IS_INDICATOR_MESSAGES_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), INDICATOR_MESSAGES_TYPE))
#define INDICATOR_MESSAGES_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), INDICATOR_MESSAGES_TYPE, IndicatorMessagesClass))
+#define M_PI 3.1415926535897932384626433832795028841971693993751
+
+#define RIGHT_LABEL_FONT_SIZE 12
+#define RIGHT_LABEL_RADIUS 20
+
typedef struct _IndicatorMessages IndicatorMessages;
typedef struct _IndicatorMessagesClass IndicatorMessagesClass;
@@ -285,6 +290,74 @@
return;
}
+/* Custom function to draw rounded rectangle with max radius */
+static void
+custom_cairo_rounded_rectangle (cairo_t *cr,
+double x, double y, double w, double h)
+{
+ double radius = MIN (w/2.0, h/2.0);
+
+ cairo_move_to (cr, x+radius, y);
+ cairo_arc (cr, x+w-radius, y+radius, radius, M_PI*1.5, M_PI*2);
+ cairo_arc (cr, x+w-radius, y+h-radius, radius, 0, M_PI*0.5);
+ cairo_arc (cr, x+radius, y+h-radius, radius, M_PI*0.5, M_PI);
+ cairo_arc (cr, x+radius, y+radius, radius, M_PI, M_PI*1.5);
+}
+
+/* Draws a rounded rectangle with text inside. */
+static gboolean
+numbers_draw_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data)
+{
+ GtkStyle *style;
+ cairo_t *cr;
+ double x, y, w, h;
+ PangoLayout * layout;
+ gint font_size = RIGHT_LABEL_FONT_SIZE;
+
+ if (!GTK_IS_WIDGET (widget)) return;
+
+ /* get style */
+ style = gtk_widget_get_style (widget);
+
+ /* set arrow position / dimensions */
+ w = widget-allocation.width;
+ h = widget-allocation.height;
+ x = widget-allocation.x;
+ y = widget-allocation.y;
+
+ layout = gtk_label_get_layout (GTK_LABEL(widget));
+
+ /* This does not work, don't ask me why but font_size is 0.
+ * I wanted to use a dynamic font size to adjust the padding on left/right edges
+ * of the rounded rectangle. Andrea Cimitan */
+ /* const PangoFontDescription * font_description = pango_layout_get_font_description (layout);
+ font_size = pango_font_description_get_size (font_description); */
+
+ /* initialize cairo drawing area */
+ cr = (cairo_t*) gdk_cairo_create (widget-window);
+
+ /* set line width */
+ cairo_set_line_width (cr, 1.0);
+
+ cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD);
+
+ /* cairo drawing code */
+ custom_cairo_rounded_rectangle (cr, x - font_size/2.0, y, w + font_size, h);
+
+ cairo_set_source_rgba (cr, style-fg[gtk_widget_get_state(widget)].red/65535.0,
+ style-fg[gtk_widget_get_state(widget)].green/65535.0,
+ style-fg[gtk_widget_get_state(widget)].blue/65535.0, 0.5);
+
+ cairo_move_to (cr, x, y);
+ pango_cairo_layout_path (cr, layout);
+ cairo_fill (cr);
+
+ /* remember to destroy cairo context to avoid leaks */
+cairo_destroy (cr);
+
+ return TRUE;
+}
+
/* Builds a menu item representing a running application in the
messaging menu */
static gboolean
@@ -335,7 +408,6 @@
return TRUE;
}
-
typedef struct _indicator_item_t indicator_item_t;
struct _indicator_item_t {
GtkWidget * icon;
@@ -405,6 +477,7 @@
GtkMenuItem * gmi = GTK_MENU_ITEM(gtk_menu_item_new());
gint padding = 4;
+ gint font_size = RIGHT_LABEL_FONT_SIZE;
gtk_widget_style_get(GTK_WIDGET(gmi), horizontal-padding, padding, NULL);
GtkWidget * hbox = gtk_hbox_new(FALSE, 0);
@@ -455,8 +528,16 @@
item. */
mi_data-right = gtk_label_new(dbusmenu_menuitem_property_get(newitem, INDICATOR_MENUITEM_PROP_RIGHT));
gtk_size_group_add_widget(indicator_right_group, mi_data-right);
+
+ /* Doesn't work, look numbers_draw_cb. */
+ /* PangoLayout * right_layout = gtk_label_get_layout (GTK_LABEL(mi_data-right));
+ font_size = pango_font_description_get_size (pango_layout_get_font_description (right_layout)); */
+
+ g_signal_connect (G_OBJECT (mi_data-right),
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 191: running apps triangle indicator overlay from Cimi
Merge authors:
Andrea Cimitan (cimi)
David Barth (dbarth)
Related merge proposals:
https://code.launchpad.net/~cimi/indicator-messages/left-triangle/+merge/31283
proposed by: Andrea Cimitan (cimi)
review: Approve - David Barth (dbarth)
revno: 191 [merge]
committer: David Barth david.ba...@canonical.com
branch nick: indicator-messages
timestamp: Thu 2010-07-29 18:21:13 +0200
message:
running apps triangle indicator overlay from Cimi
modified:
src/indicator-messages.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 'src/indicator-messages.c'
--- src/indicator-messages.c 2010-07-29 11:40:02 +
+++ src/indicator-messages.c 2010-07-29 16:09:26 +
@@ -290,6 +290,47 @@
return;
}
+/* Draws a triangle on the left, using fg[STATE_TYPE] color. */
+static gboolean
+application_triangle_draw_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data)
+{
+ GtkStyle *style;
+ cairo_t *cr;
+ int x, y, arrow_width, arrow_height;
+
+ if (!GTK_IS_WIDGET (widget)) return FALSE;
+
+ /* get style */
+ style = gtk_widget_get_style (widget);
+
+ /* set arrow position / dimensions */
+ arrow_width = (int) ((double)widget-allocation.height * 0.25f);
+ arrow_height = (int) ((double)widget-allocation.height * 0.50f);
+ x = widget-allocation.x;
+ y = widget-allocation.y + widget-allocation.height/2.0 - (double)arrow_height/2.0;
+
+ /* initialize cairo drawing area */
+ cr = (cairo_t*) gdk_cairo_create (widget-window);
+
+ /* set line width */
+ cairo_set_line_width (cr, 1.0);
+
+ /* cairo drawing code */
+ cairo_move_to (cr, x, y);
+ cairo_line_to (cr, x, y + arrow_height);
+ cairo_line_to (cr, x + arrow_width, y + (double)arrow_height/2.0);
+ cairo_close_path (cr);
+ cairo_set_source_rgb (cr, style-fg[gtk_widget_get_state(widget)].red/65535.0,
+ style-fg[gtk_widget_get_state(widget)].green/65535.0,
+ style-fg[gtk_widget_get_state(widget)].blue/65535.0);
+ cairo_fill (cr);
+
+ /* remember to destroy cairo context to avoid leaks */
+cairo_destroy (cr);
+
+ return FALSE;
+}
+
/* Custom function to draw rounded rectangle with max radius */
static void
custom_cairo_rounded_rectangle (cairo_t *cr,
@@ -314,7 +355,7 @@
PangoLayout * layout;
gint font_size = RIGHT_LABEL_FONT_SIZE;
- if (!GTK_IS_WIDGET (widget)) return;
+ if (!GTK_IS_WIDGET (widget)) return FALSE;
/* get style */
style = gtk_widget_get_style (widget);
@@ -390,20 +431,13 @@
gtk_container_add(GTK_CONTAINER(gmi), hbox);
gtk_widget_show(hbox);
- /* Build up the running icon */
- GtkWidget * running_icon = gtk_image_new_from_icon_name(application-running, GTK_ICON_SIZE_MENU);
- gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(gmi), running_icon);
- gtk_widget_show(running_icon);
-
- /* Make sure it always appears */
- gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM(gmi), TRUE);
-
/* Attach some of the standard GTK stuff */
dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, gmi, parent);
/* Make sure we can handle the label changing */
g_signal_connect(G_OBJECT(newitem), DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED, G_CALLBACK(application_prop_change_cb), label);
g_signal_connect(G_OBJECT(newitem), DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED, G_CALLBACK(application_icon_change_cb), icon);
+ g_signal_connect_after(G_OBJECT (gmi), expose_event, G_CALLBACK (application_triangle_draw_cb), NULL);
return TRUE;
}
@@ -528,11 +562,7 @@
item. */
mi_data-right = gtk_label_new(dbusmenu_menuitem_property_get(newitem, INDICATOR_MENUITEM_PROP_RIGHT));
gtk_size_group_add_widget(indicator_right_group, mi_data-right);
-
- /* Doesn't work, look numbers_draw_cb. */
- /* PangoLayout * right_layout = gtk_label_get_layout (GTK_LABEL(mi_data-right));
- font_size = pango_font_description_get_size (pango_layout_get_font_description (right_layout)); */
-
+ /* install extra decoration overlay */
g_signal_connect (G_OBJECT (mi_data-right), expose_event,
G_CALLBACK (numbers_draw_cb), NULL);
@@ -575,4 +605,3 @@
return GTK_MENU(menu);
}
-
___
Mailing list: https://launchpad.net/~ayatana-commits
Post to : ayatana-commits@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ayatana-commits
More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 192: 0.3.8
revno: 192 tags: 0.3.8 committer: David Barth david.ba...@canonical.com branch nick: indicator-messages timestamp: Thu 2010-07-29 18:50:05 +0200 message: 0.3.8 modified: configure.ac -- 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-05-21 19:45:55 + +++ configure.ac 2010-07-29 16:50:05 + @@ -4,7 +4,7 @@ AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-messages, 0.3.7) +AM_INIT_AUTOMAKE(indicator-messages, 0.3.8) AM_MAINTAINER_MODE ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 189: Dummy commit
revno: 189 committer: Ted Gould t...@gould.cx branch nick: trunk timestamp: Fri 2010-05-21 15:20:27 -0500 message: Dummy commit -- 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 ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 188: 0.3.7
revno: 188 tags: 0.3.7 committer: Ted Gould t...@gould.cx branch nick: trunk timestamp: Fri 2010-05-21 14:45:55 -0500 message: 0.3.7 modified: configure.ac -- 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-04-01 15:06:18 + +++ configure.ac 2010-05-21 19:45:55 + @@ -4,7 +4,7 @@ AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-messages, 0.3.6) +AM_INIT_AUTOMAKE(indicator-messages, 0.3.7) AM_MAINTAINER_MODE ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 187: Patch from Kees to ensure the hashtable keeps its memory
Merge authors:
Kees Cook (kees)
Related merge proposals:
https://code.launchpad.net/~kees/indicator-messages/trunk-lp-533021/+merge/24304
proposed by: Kees Cook (kees)
review: Approve - Ted Gould (ted)
revno: 187 [merge]
committer: Ted Gould t...@gould.cx
branch nick: trunk
timestamp: Wed 2010-04-28 08:07:25 -0500
message:
Patch from Kees to ensure the hashtable keeps its memory
modified:
src/messages-service.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 'src/messages-service.c'
--- src/messages-service.c 2010-04-17 17:59:27 +
+++ src/messages-service.c 2010-04-28 10:33:57 +
@@ -315,7 +315,7 @@
}
/* Add a definition file into the black list and eclipse
- and launchers that have the same file. */
+ any launchers that have the same file. */
static gboolean
blacklist_add (gpointer udata)
{
@@ -359,7 +359,7 @@
}
/* Actually blacklist this thing */
- g_hash_table_insert(blacklist, desktop, definition);
+ g_hash_table_insert(blacklist, g_strdup(desktop), g_strdup(definition));
g_debug(Adding Blacklist item '%s' for desktop '%s', definition, desktop);
/* Go through and eclipse folks */
___
Mailing list: https://launchpad.net/~ayatana-commits
Post to : ayatana-commits@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ayatana-commits
More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 186: Check for whether a desktop file is eclipsed when loaded.
Merge authors:
Ted Gould (ted)
Related merge proposals:
https://code.launchpad.net/~ted/indicator-messages/eclipse-on-desktop/+merge/23602
proposed by: Ted Gould (ted)
review: Approve - Cody Russell (bratsche)
revno: 186 [merge]
committer: Ted Gould t...@gould.cx
branch nick: trunk
timestamp: Sat 2010-04-17 12:59:27 -0500
message:
Check for whether a desktop file is eclipsed when loaded.
modified:
src/messages-service.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 'src/messages-service.c'
--- src/messages-service.c 2010-04-16 15:05:43 +
+++ src/messages-service.c 2010-04-17 17:59:27 +
@@ -1362,6 +1362,14 @@
dbusmenu_menuitem_property_set_bool(ll-separator, DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
}
+ /* Check to see if any of the current applications should
+ be eclipsing us. */
+ GList * server;
+ for (server = serverList; server != NULL; server = g_list_next(server)) {
+ serverList_t * slt = (serverList_t *)server-data;
+ check_eclipses(slt-menuitem);
+ }
+
resort_menu(root_menuitem);
check_hidden();
} else {
___
Mailing list: https://launchpad.net/~ayatana-commits
Post to : ayatana-commits@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ayatana-commits
More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 184: 0.3.6
revno: 184 tags: 0.3.6 committer: Ted Gould t...@gould.cx branch nick: trunk timestamp: Thu 2010-04-01 10:06:18 -0500 message: 0.3.6 modified: configure.ac -- 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-03-25 15:36:41 + +++ configure.ac 2010-04-01 15:06:18 + @@ -4,7 +4,7 @@ AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-messages, 0.3.5) +AM_INIT_AUTOMAKE(indicator-messages, 0.3.6) AM_MAINTAINER_MODE ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 177: Making a small indicator on apps that are running.
Merge authors:
Ted Gould (ted)
Related merge proposals:
https://code.launchpad.net/~ted/indicator-messages/running-indicator/+merge/21983
proposed by: Ted Gould (ted)
review: Approve - David Barth (dbarth)
revno: 177 [merge]
committer: Ted Gould t...@gould.cx
branch nick: trunk
timestamp: Wed 2010-03-24 10:02:47 -0500
message:
Making a small indicator on apps that are running.
modified:
.bzrignore
src/app-menu-item.c
src/dbus-data.h
src/indicator-messages.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 '.bzrignore'
--- .bzrignore 2010-02-09 03:59:51 +
+++ .bzrignore 2010-03-04 21:14:24 +
@@ -22,3 +22,4 @@
src/messages-service-client.h
src/messages-service-server.h
po/indicator-messages.pot
+src/libmessaging_la-app-gtk-menu-item.lo
=== modified file 'src/app-menu-item.c'
--- src/app-menu-item.c 2010-03-04 20:41:48 +
+++ src/app-menu-item.c 2010-03-23 21:08:48 +
@@ -210,6 +210,8 @@
/* Can not ref as not real GObject */
priv-server = server;
+ dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_TYPE, APPLICATION_MENUITEM_TYPE);
+
/* Set up listener signals */
g_signal_connect(G_OBJECT(listener), INDICATE_LISTENER_SIGNAL_SERVER_COUNT_CHANGED, G_CALLBACK(count_changed), self);
@@ -244,10 +246,10 @@
/* TRANSLATORS: This is the name of the program and the number of indicators. So it
would read something like Mail Client (5) */
gchar * label = g_strdup_printf(_(%s (%d)), _(name), priv-unreadcount);
- dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_LABEL, label);
+ dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), APPLICATION_MENUITEM_PROP_NAME, label);
g_free(label);
} else {
- dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_LABEL, _(name));
+ dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), APPLICATION_MENUITEM_PROP_NAME, _(name));
}
return;
@@ -318,10 +320,10 @@
if (def_icon == NULL) {
GIcon * icon = g_app_info_get_icon(priv-appinfo);
gchar * iconstr = g_icon_to_string(icon);
- dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_ICON_NAME, iconstr);
+ dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), APPLICATION_MENUITEM_PROP_ICON, iconstr);
g_free(iconstr);
} else {
- dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_ICON_NAME, def_icon);
+ dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), APPLICATION_MENUITEM_PROP_ICON, def_icon);
}
g_signal_emit(G_OBJECT(self), signals[NAME_CHANGED], 0, app_menu_item_get_name(self), TRUE);
=== modified file 'src/dbus-data.h'
--- src/dbus-data.h 2010-02-18 03:36:33 +
+++ src/dbus-data.h 2010-03-23 20:45:35 +
@@ -10,7 +10,7 @@
#define APPLICATION_MENUITEM_TYPEapplication-item
#define APPLICATION_MENUITEM_PROP_NAME app-name
-#define APPLICATION_MENUITEM_PROP_COUNT app-count
+#define APPLICATION_MENUITEM_PROP_ICON app-icon
#define INDICATOR_MENUITEM_TYPE indicator-item
#define INDICATOR_MENUITEM_PROP_LABELindicator-label
=== modified file 'src/indicator-messages.c'
--- src/indicator-messages.c 2010-03-18 18:24:29 +
+++ src/indicator-messages.c 2010-03-23 21:22:26 +
@@ -207,6 +207,70 @@
return FALSE;
}
+/* Sets the label when it changes. */
+static void
+application_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GValue * value, gpointer user_data)
+{
+ if (!g_strcmp0(prop, APPLICATION_MENUITEM_PROP_NAME)) {
+ /* Set the main label */
+ if (GTK_IS_LABEL(user_data)) {
+ gtk_label_set_text(GTK_LABEL(user_data), g_value_get_string(value));
+ }
+ }
+
+ return;
+}
+
+/* Builds a menu item representing a running application in the
+ messaging menu */
+static gboolean
+new_application_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client)
+{
+ GtkMenuItem * gmi = GTK_MENU_ITEM(gtk_image_menu_item_new());
+
+ gint padding = 4;
+ gtk_widget_style_get(GTK_WIDGET(gmi), horizontal-padding, padding, NULL);
+
+ GtkWidget * hbox = gtk_hbox_new(FALSE, 0);
+
+ /* Set the minimum size, we always want it to take space */
+ gint width, height;
+ gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, width, height);
+
+ GtkWidget * icon = gtk_image_new_from_icon_name(dbusmenu_menuitem_property_get(newitem, APPLICATION_MENUITEM_PROP_ICON), GTK_ICON_SIZE_MENU);
+ gtk_widget_set_size_request(icon, width, height);
+ gtk_misc_set_alignment(GTK_MISC(icon), 0.0, 0.5);
+ gtk_box_pack_start(GTK_BOX(hbox), icon, FALSE, FALSE, padding);
+ gtk_widget_show(icon);
+
+ /* Application name in a label */
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 175: Make the avatar spacing same as the other icons in the menu
Merge authors:
Ted Gould (ted)
Related merge proposals:
https://code.launchpad.net/~ted/indicator-messages/avatar-spacing/+merge/21612
proposed by: Ted Gould (ted)
review: Approve - Cody Russell (bratsche)
revno: 175 [merge]
committer: Ted Gould t...@gould.cx
branch nick: trunk
timestamp: Thu 2010-03-18 13:24:29 -0500
message:
Make the avatar spacing same as the other icons in the menu
modified:
src/indicator-messages.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 'src/indicator-messages.c'
--- src/indicator-messages.c 2010-03-18 04:28:10 +
+++ src/indicator-messages.c 2010-03-18 18:24:29 +
@@ -277,17 +277,24 @@
GtkMenuItem * gmi = GTK_MENU_ITEM(gtk_menu_item_new());
- GtkWidget * hbox = gtk_hbox_new(FALSE, 4);
+ gint padding = 4;
+ gtk_widget_style_get(GTK_WIDGET(gmi), horizontal-padding, padding, NULL);
+
+ GtkWidget * hbox = gtk_hbox_new(FALSE, 0);
/* Icon, probably someone's face or avatar on an IM */
mi_data-icon = gtk_image_new();
+
+ /* Set the minimum size, we always want it to take space */
+ gint width, height;
+ gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, width, height);
+ gtk_widget_set_size_request(mi_data-icon, width, height);
+
GdkPixbuf * pixbuf = dbusmenu_menuitem_property_get_image(newitem, INDICATOR_MENUITEM_PROP_ICON);
if (pixbuf != NULL) {
/* If we've got a pixbuf we need to make sure it's of a reasonable
size to fit in the menu. If not, rescale it. */
GdkPixbuf * resized_pixbuf;
- gint width, height;
- gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, width, height);
if (gdk_pixbuf_get_width(pixbuf) width ||
gdk_pixbuf_get_height(pixbuf) height) {
g_debug(Resizing icon from %dx%d to %dx%d, gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf), width, height);
@@ -308,13 +315,13 @@
}
}
gtk_misc_set_alignment(GTK_MISC(mi_data-icon), 0.0, 0.5);
- gtk_box_pack_start(GTK_BOX(hbox), mi_data-icon, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(hbox), mi_data-icon, FALSE, FALSE, padding);
gtk_widget_show(mi_data-icon);
/* Label, probably a username, chat room or mailbox name */
mi_data-label = gtk_label_new(dbusmenu_menuitem_property_get(newitem, INDICATOR_MENUITEM_PROP_LABEL));
gtk_misc_set_alignment(GTK_MISC(mi_data-label), 0.0, 0.5);
- gtk_box_pack_start(GTK_BOX(hbox), mi_data-label, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(hbox), mi_data-label, TRUE, TRUE, padding);
gtk_widget_show(mi_data-label);
/* Usually either the time or the count on the individual
@@ -322,7 +329,7 @@
mi_data-right = gtk_label_new(dbusmenu_menuitem_property_get(newitem, INDICATOR_MENUITEM_PROP_RIGHT));
gtk_size_group_add_widget(indicator_right_group, mi_data-right);
gtk_misc_set_alignment(GTK_MISC(mi_data-right), 1.0, 0.5);
- gtk_box_pack_start(GTK_BOX(hbox), mi_data-right, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(hbox), mi_data-right, FALSE, FALSE, padding);
gtk_widget_show(mi_data-right);
gtk_container_add(GTK_CONTAINER(gmi), hbox);
___
Mailing list: https://launchpad.net/~ayatana-commits
Post to : ayatana-commits@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ayatana-commits
More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 176: 0.3.4
revno: 176 tags: 0.3.4 committer: Ted Gould t...@gould.cx branch nick: trunk timestamp: Thu 2010-03-18 13:28:16 -0500 message: 0.3.4 modified: configure.ac -- 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-03-18 04:24:34 + +++ configure.ac 2010-03-18 18:28:16 + @@ -4,7 +4,7 @@ AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-messages, 0.3.3) +AM_INIT_AUTOMAKE(indicator-messages, 0.3.4) AM_MAINTAINER_MODE ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 171: String changes to match everyone else.
Merge authors:
Ted Gould (ted)
Related merge proposals:
https://code.launchpad.net/~ted/indicator-messages/broadcast-this/+merge/21245
proposed by: Ted Gould (ted)
review: Approve - Ken VanDine (ken-vandine)
revno: 171 [merge]
committer: Ted Gould t...@gould.cx
branch nick: trunk
timestamp: Fri 2010-03-12 09:53:04 -0600
message:
String changes to match everyone else.
modified:
src/default-applications.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 'src/default-applications.c'
--- src/default-applications.c 2010-03-04 20:27:29 +
+++ src/default-applications.c 2010-03-12 14:49:32 +
@@ -31,9 +31,9 @@
};
struct default_db_t default_db[] = {
- {evolution.desktop, N_(Mail), N_(Set Up Mail...), applications-email-panel},
- {empathy.desktop, N_(Chat), N_(Set Up Chat...), applications-chat-panel},
- {gwibber.desktop, N_(Microblogging), N_(Set Up Microblogging...), applications-microblogging-panel},
+ {evolution.desktop, N_(Mail), N_(Set Up Mail...), applications-email-panel},
+ {empathy.desktop, N_(Chat), N_(Set Up Chat...), applications-chat-panel},
+ {gwibber.desktop, N_(Broadcast), N_(Set Up Broadcast Account...), applications-microblogging-panel},
{NULL, NULL}
};
___
Mailing list: https://launchpad.net/~ayatana-commits
Post to : ayatana-commits@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ayatana-commits
More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 172: Handling bools by getting a value for indicators requesting attention.
Merge authors:
Ted Gould (ted)
Related merge proposals:
https://code.launchpad.net/~ted/indicator-messages/bool-handling/+merge/21254
proposed by: Ted Gould (ted)
review: Approve - Aurélien Gâteau (agateau)
revno: 172 [merge]
committer: Ted Gould t...@gould.cx
branch nick: trunk
timestamp: Fri 2010-03-12 16:45:28 -0600
message:
Handling bools by getting a value for indicators requesting attention.
modified:
src/im-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 'src/im-menu-item.c'
--- src/im-menu-item.c 2010-02-05 02:12:10 +
+++ src/im-menu-item.c 2010-03-12 16:07:07 +
@@ -358,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, const gchar * propertydata, gpointer data)
+attention_cb (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, const GValue * propertydata, gpointer data)
{
g_debug(Got Attention Information);
ImMenuItem * self = IM_MENU_ITEM(data);
@@ -373,10 +373,19 @@
ImMenuItemPrivate * priv = IM_MENU_ITEM_GET_PRIVATE(self);
gboolean wantit;
- if (propertydata == NULL || propertydata[0] == '\0' || !g_strcmp0(propertydata, false)) {
- wantit = FALSE;
+ if (G_VALUE_HOLDS_BOOLEAN(propertydata)) {
+ wantit = g_value_get_boolean(propertydata);
+ } else if (G_VALUE_HOLDS_STRING(propertydata)) {
+ const gchar * propstring = g_value_get_string(propertydata);
+
+ if (propstring == NULL || propstring[0] == '\0' || !g_strcmp0(propstring, false)) {
+ wantit = FALSE;
+ } else {
+ wantit = TRUE;
+ }
} else {
- wantit = TRUE;
+ g_warning(Got property '%s' of an unknown type., property);
+ return;
}
if (priv-attention != wantit) {
@@ -418,7 +427,7 @@
} else if (!g_strcmp0(property, INDICATE_INDICATOR_MESSAGES_PROP_COUNT)) {
indicate_listener_get_property(listener, server, indicator, INDICATE_INDICATOR_MESSAGES_PROP_COUNT, count_cb, self);
} else if (!g_strcmp0(property, INDICATE_INDICATOR_MESSAGES_PROP_ATTENTION)) {
- indicate_listener_get_property(listener, server, indicator, INDICATE_INDICATOR_MESSAGES_PROP_ATTENTION, attention_cb, self);
+ indicate_listener_get_property_value(listener, server, indicator, INDICATE_INDICATOR_MESSAGES_PROP_ATTENTION, attention_cb, self);
} else if (!g_strcmp0(property, sender)) {
/* This is a compatibility string with v1 and should be removed */
g_debug(Indicator is using 'sender' property which is a v1 string.);
@@ -451,7 +460,7 @@
indicate_listener_get_property_time(listener, server, indicator, INDICATE_INDICATOR_MESSAGES_PROP_TIME, time_cb, self);
indicate_listener_get_property(listener, server, indicator, INDICATE_INDICATOR_MESSAGES_PROP_ICON, icon_cb, self);
indicate_listener_get_property(listener, server, indicator, INDICATE_INDICATOR_MESSAGES_PROP_COUNT, count_cb, self);
- indicate_listener_get_property(listener, server, indicator, INDICATE_INDICATOR_MESSAGES_PROP_ATTENTION, attention_cb, self);
+ indicate_listener_get_property_value(listener, server, indicator, INDICATE_INDICATOR_MESSAGES_PROP_ATTENTION, attention_cb, self);
indicate_listener_get_property(listener, server, indicator, sender, sender_cb, self);
g_signal_connect(G_OBJECT(self), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(activate_cb), NULL);
___
Mailing list: https://launchpad.net/~ayatana-commits
Post to : ayatana-commits@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ayatana-commits
More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 169: Putting in default icons for the default apps that are panel themed
Merge authors: Ted Gould (ted) Related merge proposals: https://code.launchpad.net/~ted/indicator-messages/default-panel-icons/+merge/20698 proposed by: Ted Gould (ted) revno: 169 [merge] committer: Ted Gould t...@gould.cx branch nick: trunk timestamp: Thu 2010-03-04 15:57:10 -0600 message: Putting in default icons for the default apps that are panel themed added: data/icons/16x16/categories/ data/icons/16x16/categories/Makefile.am data/icons/16x16/categories/applications-chat-panel.png data/icons/16x16/categories/applications-email-panel.png data/icons/16x16/categories/applications-microblogging-panel.png data/icons/22x22/categories/ data/icons/22x22/categories/Makefile.am data/icons/22x22/categories/applications-email-panel.png data/icons/32x32/categories/ data/icons/32x32/categories/Makefile.am data/icons/32x32/categories/applications-chat-panel.png data/icons/32x32/categories/applications-email-panel.png data/icons/scalable/categories/ data/icons/scalable/categories/Makefile.am data/icons/scalable/categories/applications-chat-panel.svg data/icons/scalable/categories/applications-email-panel.svg modified: configure.ac data/icons/16x16/Makefile.am data/icons/22x22/Makefile.am data/icons/32x32/Makefile.am data/icons/scalable/Makefile.am src/app-menu-item.c src/default-applications.c src/default-applications.h 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-02-18 18:15:43 + +++ configure.ac 2010-03-04 20:23:07 + @@ -111,16 +111,20 @@ data/icons/Makefile data/icons/16x16/Makefile data/icons/16x16/status/Makefile +data/icons/16x16/categories/Makefile data/icons/22x22/Makefile data/icons/22x22/status/Makefile +data/icons/22x22/categories/Makefile data/icons/24x24/Makefile data/icons/24x24/status/Makefile data/icons/32x32/Makefile data/icons/32x32/status/Makefile +data/icons/32x32/categories/Makefile data/icons/48x48/Makefile data/icons/48x48/status/Makefile data/icons/scalable/Makefile data/icons/scalable/status/Makefile +data/icons/scalable/categories/Makefile po/Makefile.in ]) === modified file 'data/icons/16x16/Makefile.am' --- data/icons/16x16/Makefile.am 2009-02-04 16:01:51 + +++ data/icons/16x16/Makefile.am 2010-03-04 20:23:07 + @@ -1,1 +1,1 @@ -SUBDIRS = status +SUBDIRS = status categories === added directory 'data/icons/16x16/categories' === added file 'data/icons/16x16/categories/Makefile.am' --- data/icons/16x16/categories/Makefile.am 1970-01-01 00:00:00 + +++ data/icons/16x16/categories/Makefile.am 2010-03-04 20:23:07 + @@ -0,0 +1,10 @@ + +iconsdir = $(INDICATORICONSDIR)/hicolor/16x16/categories + +icons_DATA = \ + applications-email-panel.png \ + applications-chat-panel.png \ + applications-microblogging-panel.png + +EXTRA_DIST = $(icons_DATA) + === added file 'data/icons/16x16/categories/applications-chat-panel.png' Binary files data/icons/16x16/categories/applications-chat-panel.png 1970-01-01 00:00:00 + and data/icons/16x16/categories/applications-chat-panel.png 2010-03-04 20:23:07 + differ === added file 'data/icons/16x16/categories/applications-email-panel.png' Binary files data/icons/16x16/categories/applications-email-panel.png 1970-01-01 00:00:00 + and data/icons/16x16/categories/applications-email-panel.png 2010-03-04 20:23:07 + differ === added file 'data/icons/16x16/categories/applications-microblogging-panel.png' Binary files data/icons/16x16/categories/applications-microblogging-panel.png 1970-01-01 00:00:00 + and data/icons/16x16/categories/applications-microblogging-panel.png 2010-03-04 20:23:07 + differ === modified file 'data/icons/22x22/Makefile.am' --- data/icons/22x22/Makefile.am 2009-02-04 16:01:51 + +++ data/icons/22x22/Makefile.am 2010-03-04 20:23:07 + @@ -1,1 +1,1 @@ -SUBDIRS = status +SUBDIRS = status categories === added directory 'data/icons/22x22/categories' === added file 'data/icons/22x22/categories/Makefile.am' --- data/icons/22x22/categories/Makefile.am 1970-01-01 00:00:00 + +++ data/icons/22x22/categories/Makefile.am 2010-03-04 20:23:07 + @@ -0,0 +1,8 @@ + +iconsdir = $(INDICATORICONSDIR)/hicolor/22x22/categories + +icons_DATA = \ + applications-email-panel.png + +EXTRA_DIST = $(icons_DATA) + === added file 'data/icons/22x22/categories/applications-email-panel.png' Binary files data/icons/22x22/categories/applications-email-panel.png 1970-01-01 00:00:00 + and data/icons/22x22/categories/applications-email-panel.png 2010-03-04 20:23:07 + differ === modified file 'data/icons/32x32/Makefile.am' ---
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 170: 0.3.3
revno: 170 tags: 0.3.3 committer: Ted Gould t...@gould.cx branch nick: trunk timestamp: Thu 2010-03-04 15:58:38 -0600 message: 0.3.3 modified: configure.ac -- 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-03-04 20:23:07 + +++ configure.ac 2010-03-04 21:58:38 + @@ -4,7 +4,7 @@ AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-messages, 0.3.2) +AM_INIT_AUTOMAKE(indicator-messages, 0.3.3) AM_MAINTAINER_MODE ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 168: Setting up default application names in the menu.
Merge authors:
Ted Gould (ted)
Related merge proposals:
https://code.launchpad.net/~ted/indicator-messages/default-application-names/+merge/20628
proposed by: Ted Gould (ted)
revno: 168 [merge]
committer: Ted Gould t...@gould.cx
branch nick: trunk
timestamp: Thu 2010-03-04 13:06:47 -0600
message:
Setting up default application names in the menu.
added:
src/default-applications.c
src/default-applications.h
modified:
po/POTFILES.in
src/Makefile.am
src/app-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 'po/POTFILES.in'
--- po/POTFILES.in 2009-09-15 21:13:51 +
+++ po/POTFILES.in 2010-03-04 06:35:22 +
@@ -2,6 +2,7 @@
src/messages-service-dbus.c
src/indicator-messages.c
src/messages-service.c
+src/default-applications.c
src/launcher-menu-item.c
src/im-menu-item.c
src/app-menu-item.c
=== modified file 'src/Makefile.am'
--- src/Makefile.am 2009-09-09 14:52:36 +
+++ src/Makefile.am 2010-03-04 06:13:50 +
@@ -20,6 +20,8 @@
##
indicator_messages_service_SOURCES = \
+ default-applications.h \
+ default-applications.c \
messages-service.c \
messages-service-server.h \
messages-service-dbus.c \
=== modified file 'src/app-menu-item.c'
--- src/app-menu-item.c 2010-02-18 17:23:29 +
+++ src/app-menu-item.c 2010-03-04 06:54:02 +
@@ -30,6 +30,7 @@
#include libdbusmenu-glib/menuitem-proxy.h
#include app-menu-item.h
#include dbus-data.h
+#include default-applications.h
enum {
COUNT_CHANGED,
@@ -233,15 +234,20 @@
update_label (AppMenuItem * self)
{
AppMenuItemPrivate * priv = APP_MENU_ITEM_GET_PRIVATE(self);
+ const gchar * name = get_default_name(priv-desktop);
+
+ if (name == NULL) {
+ name = app_menu_item_get_name(self);
+ }
if (priv-unreadcount 0) {
/* TRANSLATORS: This is the name of the program and the number of indicators. So it
would read something like Mail Client (5) */
- gchar * label = g_strdup_printf(_(%s (%d)), app_menu_item_get_name(self), priv-unreadcount);
+ gchar * label = g_strdup_printf(_(%s (%d)), _(name), priv-unreadcount);
dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_LABEL, label);
g_free(label);
} else {
- dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_LABEL, app_menu_item_get_name(self));
+ dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_LABEL, _(name));
}
return;
=== added file 'src/default-applications.c'
--- src/default-applications.c 1970-01-01 00:00:00 +
+++ src/default-applications.c 2010-03-04 06:39:52 +
@@ -0,0 +1,80 @@
+/*
+Looking for the default applications. A quick lookup.
+
+Copyright 2010 Canonical Ltd.
+
+Authors:
+Ted Gould t...@canonical.com
+
+This program is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License version 3, as published
+by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranties of
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+PURPOSE. See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program. If not, see http://www.gnu.org/licenses/.
+*/
+
+#include glib.h
+#include glib/gi18n.h
+#include default-applications.h
+
+struct default_db_t {
+ const gchar * desktop_file;
+ const gchar * name;
+ const gchar * setupname;
+};
+
+struct default_db_t default_db[] = {
+ {evolution.desktop, N_(Mail), N_(Set Up Mail...)},
+ {empathy.desktop, N_(Chat), N_(Set Up Chat...)},
+ {gwibber.desktop, N_(Microblogging), N_(Set Up Microblogging...)},
+ {NULL, NULL}
+};
+
+static struct default_db_t *
+get_default_helper (const gchar * desktop_path)
+{
+ g_return_val_if_fail(desktop_path != NULL, NULL);
+ gchar * basename = g_path_get_basename(desktop_path);
+ g_return_val_if_fail(basename != NULL, NULL);
+
+ gint i;
+ for (i = 0; default_db[i].desktop_file != NULL; i++) {
+ if (g_strcmp0(default_db[i].desktop_file, basename) == 0) {
+ break;
+ }
+ }
+
+ g_free(basename);
+
+ if (default_db[i].desktop_file != NULL) {
+ return default_db[i];
+ }
+
+ return NULL;
+}
+
+const gchar *
+get_default_name (const gchar * desktop_path)
+{
+ struct default_db_t * db = get_default_helper(desktop_path);
+
+ if (db == NULL)
+ return NULL;
+ return db-name;
+}
+
+const gchar *
+get_default_setup (const gchar * desktop_path)
+{
+ struct default_db_t * db =
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 163: Adding in the ability to take static commands from a desktop file
Merge authors:
Ted Gould (ted)
Related merge proposals:
https://code.launchpad.net/~ted/indicator-messages/static-commands/+merge/19528
proposed by: Ted Gould (ted)
review: Needs Fixing - Neil J. Patel (njpatel)
revno: 163 [merge]
committer: Ted Gould t...@gould.cx
branch nick: trunk
timestamp: Thu 2010-02-18 11:15:52 -0600
message:
Adding in the ability to take static commands from a desktop file
modified:
configure.ac
src/launcher-menu-item.c
src/launcher-menu-item.h
src/messages-service.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-02-05 02:20:22 +
+++ configure.ac 2010-02-18 17:07:50 +
@@ -30,7 +30,7 @@
GIO_UNIX_REQUIRED_VERSION=2.18
PANEL_REQUIRED_VERSION=2.0.0
INDICATE_REQUIRED_VERSION=0.3.0
-INDICATOR_REQUIRED_VERSION=0.3.0
+INDICATOR_REQUIRED_VERSION=0.3.3
DBUSMENUGTK_REQUIRED_VERSION=0.2.2
PKG_CHECK_MODULES(APPLET, gtk+-2.0 = $GTK_REQUIRED_VERSION
=== modified file 'src/launcher-menu-item.c'
--- src/launcher-menu-item.c 2010-02-05 02:13:13 +
+++ src/launcher-menu-item.c 2010-02-17 19:40:20 +
@@ -27,6 +27,7 @@
#include gdk/gdk.h
#include glib/gi18n.h
#include gio/gdesktopappinfo.h
+#include libindicator/indicator-desktop-shortcuts.h
#include launcher-menu-item.h
#include dbus-data.h
@@ -42,16 +43,21 @@
{
GAppInfo * appinfo;
gchar * desktop;
+ IndicatorDesktopShortcuts * ids;
+ GList * shortcuts;
};
#define LAUNCHER_MENU_ITEM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), LAUNCHER_MENU_ITEM_TYPE, LauncherMenuItemPrivate))
+#define NICK_DATA ids-nick-data
+
/* Prototypes */
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, guint timestamp, gpointer data);
+static void nick_activate_cb (LauncherMenuItem * self, guint timestamp, gpointer data);
G_DEFINE_TYPE (LauncherMenuItem, launcher_menu_item, DBUSMENU_TYPE_MENUITEM);
@@ -86,21 +92,22 @@
priv-appinfo = NULL;
priv-desktop = NULL;
+ priv-ids = NULL;
+ priv-shortcuts = NULL;
+
+ return;
+}
+
+static void
+func_unref (gpointer data, gpointer user_data)
+{
+ g_object_unref(G_OBJECT(data));
return;
}
static void
launcher_menu_item_dispose (GObject *object)
{
- // LauncherMenuItem * self = LAUNCHER_MENU_ITEM(object);
- // LauncherMenuItemPrivate * priv = LAUNCHER_MENU_ITEM_GET_PRIVATE(self);
-
- G_OBJECT_CLASS (launcher_menu_item_parent_class)-dispose (object);
-}
-
-static void
-launcher_menu_item_finalize (GObject *object)
-{
LauncherMenuItem * self = LAUNCHER_MENU_ITEM(object);
LauncherMenuItemPrivate * priv = LAUNCHER_MENU_ITEM_GET_PRIVATE(self);
@@ -109,6 +116,26 @@
priv-appinfo = NULL;
}
+ if (priv-ids != NULL) {
+ g_object_unref(priv-ids);
+ priv-ids = NULL;
+ }
+
+ if (priv-shortcuts != NULL) {
+ g_list_foreach(priv-shortcuts, func_unref, NULL);
+ g_list_free(priv-shortcuts);
+ priv-shortcuts = NULL;
+ }
+
+ G_OBJECT_CLASS (launcher_menu_item_parent_class)-dispose (object);
+}
+
+static void
+launcher_menu_item_finalize (GObject *object)
+{
+ LauncherMenuItem * self = LAUNCHER_MENU_ITEM(object);
+ LauncherMenuItemPrivate * priv = LAUNCHER_MENU_ITEM_GET_PRIVATE(self);
+
if (priv-desktop != NULL) {
g_free(priv-desktop);
priv-desktop = NULL;
@@ -127,16 +154,35 @@
LauncherMenuItemPrivate * priv = LAUNCHER_MENU_ITEM_GET_PRIVATE(self);
+ /* Parse the desktop file we've been given. */
priv-appinfo = G_APP_INFO(g_desktop_app_info_new_from_filename(desktop_file));
priv-desktop = g_strdup(desktop_file);
+ /* Set the appropriate values on this menu item based on the
+ app info that we've parsed */
g_debug(\tName: %s, launcher_menu_item_get_name(self));
dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_TYPE, LAUNCHER_MENUITEM_TYPE);
dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), LAUNCHER_MENUITEM_PROP_APP_NAME, launcher_menu_item_get_name(self));
dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), LAUNCHER_MENUITEM_PROP_APP_DESC, launcher_menu_item_get_description(self));
+ dbusmenu_menuitem_property_set_bool(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE);
g_signal_connect(G_OBJECT(self), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(activate_cb), NULL);
+ /* Start to build static shortcuts */
+ priv-ids = indicator_desktop_shortcuts_new(priv-desktop, Messaging Menu);
+ const gchar ** nicks =
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 164: Getting dynamic items from libindicate and dbusmenu
Merge authors:
Ted Gould (ted)
Related merge proposals:
https://code.launchpad.net/~ted/indicator-messages/dynamic-commands/+merge/19570
proposed by: Ted Gould (ted)
review: Needs Fixing - Neil J. Patel (njpatel)
revno: 164 [merge]
committer: Ted Gould t...@gould.cx
branch nick: trunk
timestamp: Thu 2010-02-18 11:19:27 -0600
message:
Getting dynamic items from libindicate and dbusmenu
modified:
configure.ac
src/app-menu-item.c
src/app-menu-item.h
src/messages-service.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-02-18 17:07:50 +
+++ configure.ac 2010-02-18 17:19:27 +
@@ -31,7 +31,7 @@
PANEL_REQUIRED_VERSION=2.0.0
INDICATE_REQUIRED_VERSION=0.3.0
INDICATOR_REQUIRED_VERSION=0.3.3
-DBUSMENUGTK_REQUIRED_VERSION=0.2.2
+DBUSMENUGTK_REQUIRED_VERSION=0.2.5
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 2010-02-09 19:32:28 +
+++ src/app-menu-item.c 2010-02-18 14:41:56 +
@@ -26,12 +26,15 @@
#include glib/gi18n.h
#include gio/gdesktopappinfo.h
+#include libdbusmenu-glib/client.h
+#include libdbusmenu-glib/menuitem-proxy.h
#include app-menu-item.h
#include dbus-data.h
enum {
COUNT_CHANGED,
NAME_CHANGED,
+ SHORTCUTS_CHANGED,
LAST_SIGNAL
};
@@ -48,6 +51,10 @@
GAppInfo * appinfo;
gchar * desktop;
guint unreadcount;
+
+ DbusmenuClient * client;
+ DbusmenuMenuitem * root;
+ GList * shortcuts;
};
#define APP_MENU_ITEM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), APP_MENU_ITEM_TYPE, AppMenuItemPrivate))
@@ -60,6 +67,7 @@
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 menu_cb (IndicateListener * listener, IndicateListenerServer * server, gchar * menupath, gpointer data);
static void desktop_cb (IndicateListener * listener, IndicateListenerServer * server, gchar * value, gpointer data);
static void update_label (AppMenuItem * self);
@@ -90,6 +98,13 @@
NULL, NULL,
g_cclosure_marshal_VOID__STRING,
G_TYPE_NONE, 1, G_TYPE_STRING);
+ signals[SHORTCUTS_CHANGED] = g_signal_new(APP_MENU_ITEM_SIGNAL_SHORTCUTS_CHANGED,
+ G_TYPE_FROM_CLASS(klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (AppMenuItemClass, shortcuts_changed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0, G_TYPE_NONE);
return;
}
@@ -107,6 +122,18 @@
priv-desktop = NULL;
priv-unreadcount = 0;
+ priv-client = NULL;
+ priv-root = NULL;
+ priv-shortcuts = NULL;
+
+ return;
+}
+
+/* A wrapper to make the prototypes work for GFunc */
+static void
+func_unref (gpointer data, gpointer user_data)
+{
+ g_object_unref(G_OBJECT(data));
return;
}
@@ -117,8 +144,28 @@
AppMenuItem * self = APP_MENU_ITEM(object);
AppMenuItemPrivate * priv = APP_MENU_ITEM_GET_PRIVATE(self);
- g_signal_handlers_disconnect_by_func(G_OBJECT(priv-listener), count_changed, self);
- g_object_unref(priv-listener);
+ if (priv-listener != NULL) {
+ g_signal_handlers_disconnect_by_func(G_OBJECT(priv-listener), count_changed, self);
+ g_object_unref(priv-listener);
+ priv-listener = NULL;
+ }
+
+ if (priv-shortcuts != NULL) {
+ g_list_foreach(priv-shortcuts, func_unref, NULL);
+ g_list_free(priv-shortcuts);
+ priv-shortcuts = NULL;
+ g_signal_emit(object, signals[SHORTCUTS_CHANGED], 0, TRUE);
+ }
+
+ if (priv-root != NULL) {
+ g_object_unref(priv-root);
+ priv-root = NULL;
+ }
+
+ if (priv-client != NULL) {
+ g_object_unref(priv-client);
+ priv-client = NULL;
+ }
G_OBJECT_CLASS (app_menu_item_parent_class)-dispose (object);
}
@@ -168,6 +215,7 @@
/* Get the values we care about from the server */
indicate_listener_server_get_desktop(listener, server, desktop_cb, self);
indicate_listener_server_get_count(listener, server, count_cb, self);
+ indicate_listener_server_get_menu(listener, server, menu_cb, self);
g_signal_connect(G_OBJECT(self), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(activate_cb), NULL);
@@ -206,6 +254,7 @@
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 165: Changing the applications to have icons.
Merge authors:
Ted Gould (ted)
revno: 165 [merge]
committer: Ted Gould t...@gould.cx
branch nick: trunk
timestamp: Thu 2010-02-18 11:23:29 -0600
message:
Changing the applications to have icons.
modified:
src/app-menu-item.c
src/dbus-data.h
src/indicator-messages.c
src/launcher-menu-item.c
src/launcher-menu-item.h
--
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 'src/app-menu-item.c'
--- src/app-menu-item.c 2010-02-18 14:41:56 +
+++ src/app-menu-item.c 2010-02-18 17:23:29 +
@@ -307,6 +307,12 @@
priv-desktop = g_strdup(value);
update_label(self);
+
+ GIcon * icon = g_app_info_get_icon(priv-appinfo);
+ gchar * iconstr = g_icon_to_string(icon);
+ dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_ICON_NAME, iconstr);
+ g_free(iconstr);
+
g_signal_emit(G_OBJECT(self), signals[NAME_CHANGED], 0, app_menu_item_get_name(self), TRUE);
return;
=== modified file 'src/dbus-data.h'
--- src/dbus-data.h 2009-09-04 22:14:23 +
+++ src/dbus-data.h 2010-02-18 03:36:33 +
@@ -8,10 +8,6 @@
#define INDICATOR_MESSAGES_DBUS_SERVICE_OBJECT /org/ayatana/indicator/messages/service
#define INDICATOR_MESSAGES_DBUS_SERVICE_INTERFACE org.ayatana.indicator.messages.service
-#define LAUNCHER_MENUITEM_TYPE launcher-item
-#define LAUNCHER_MENUITEM_PROP_APP_NAME application-name
-#define LAUNCHER_MENUITEM_PROP_APP_DESC application-description
-
#define APPLICATION_MENUITEM_TYPEapplication-item
#define APPLICATION_MENUITEM_PROP_NAME app-name
#define APPLICATION_MENUITEM_PROP_COUNT app-count
=== modified file 'src/indicator-messages.c'
--- src/indicator-messages.c 2009-12-18 21:43:41 +
+++ src/indicator-messages.c 2010-02-18 03:36:33 +
@@ -337,40 +337,6 @@
return TRUE;
}
-static gboolean
-new_launcher_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client)
-{
- g_return_val_if_fail(DBUSMENU_IS_MENUITEM(newitem), FALSE);
- g_return_val_if_fail(DBUSMENU_IS_GTKCLIENT(client), FALSE);
- /* Note: not checking parent, it's reasonable for it to be NULL */
-
- GtkMenuItem * gmi = GTK_MENU_ITEM(gtk_menu_item_new());
-
- GtkWidget * vbox = gtk_vbox_new(TRUE, 2);
-
- GtkWidget * app_label = gtk_label_new(dbusmenu_menuitem_property_get(newitem, LAUNCHER_MENUITEM_PROP_APP_NAME));
- gtk_misc_set_alignment(GTK_MISC(app_label), 0.0, 0.5);
- GtkWidget * dsc_label = gtk_label_new();
- gtk_misc_set_alignment(GTK_MISC(dsc_label), 0.0, 0.5);
- gtk_label_set_ellipsize(GTK_LABEL(dsc_label), PANGO_ELLIPSIZE_END);
- gtk_widget_set_size_request(dsc_label, 200, -1);
- gchar * markup = g_markup_printf_escaped(span font-size=\smaller\%s/span, dbusmenu_menuitem_property_get(newitem, LAUNCHER_MENUITEM_PROP_APP_DESC));
- gtk_label_set_markup(GTK_LABEL(dsc_label), markup);
- g_free(markup);
-
- gtk_box_pack_start(GTK_BOX(vbox), app_label, FALSE, FALSE, 0);
- gtk_widget_show(app_label);
- gtk_box_pack_start(GTK_BOX(vbox), dsc_label, FALSE, FALSE, 0);
- gtk_widget_show(dsc_label);
-
- gtk_container_add(GTK_CONTAINER(gmi), GTK_WIDGET(vbox));
- gtk_widget_show(GTK_WIDGET(vbox));
-
- dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, gmi, parent);
-
- return TRUE;
-}
-
static GtkImage *
get_icon (IndicatorObject * io)
{
@@ -409,7 +375,6 @@
DbusmenuGtkMenu * menu = dbusmenu_gtkmenu_new(INDICATOR_MESSAGES_DBUS_NAME, INDICATOR_MESSAGES_DBUS_OBJECT);
DbusmenuGtkClient * client = dbusmenu_gtkmenu_get_client(menu);
- dbusmenu_client_add_type_handler(DBUSMENU_CLIENT(client), LAUNCHER_MENUITEM_TYPE, new_launcher_item);
dbusmenu_client_add_type_handler(DBUSMENU_CLIENT(client), INDICATOR_MENUITEM_TYPE, new_indicator_item);
return GTK_MENU(menu);
=== modified file 'src/launcher-menu-item.c'
--- src/launcher-menu-item.c 2010-02-17 19:40:20 +
+++ src/launcher-menu-item.c 2010-02-18 17:23:29 +
@@ -161,9 +161,10 @@
/* Set the appropriate values on this menu item based on the
app info that we've parsed */
g_debug(\tName: %s, launcher_menu_item_get_name(self));
- dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_TYPE, LAUNCHER_MENUITEM_TYPE);
- dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), LAUNCHER_MENUITEM_PROP_APP_NAME, launcher_menu_item_get_name(self));
- dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), LAUNCHER_MENUITEM_PROP_APP_DESC, launcher_menu_item_get_description(self));
+ dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_LABEL, launcher_menu_item_get_name(self));
+ gchar * iconstr = launcher_menu_item_get_icon(self);
+
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 167: 0.3.2
revno: 167 tags: 0.3.2 committer: Ted Gould t...@gould.cx branch nick: trunk timestamp: Thu 2010-02-18 12:15:43 -0600 message: 0.3.2 modified: configure.ac -- 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-02-18 17:19:27 + +++ configure.ac 2010-02-18 18:15:43 + @@ -4,7 +4,7 @@ AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-messages, 0.3.1) +AM_INIT_AUTOMAKE(indicator-messages, 0.3.2) AM_MAINTAINER_MODE ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 158: 0.3.0
revno: 158 tags: 0.3.0 committer: Ted Gould t...@gould.cx branch nick: trunk timestamp: Fri 2010-01-08 12:00:55 -0600 message: 0.3.0 modified: configure.ac -- 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 2009-12-18 21:35:11 + +++ configure.ac 2010-01-08 18:00:55 + @@ -4,7 +4,7 @@ AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-messages, 0.2.6) +AM_INIT_AUTOMAKE(indicator-messages, 0.3.0) AM_MAINTAINER_MODE ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 154: Moving to the libindicator 0.3.0 API
Merge authors:
Ted Gould (ted)
Related merge proposals:
https://code.launchpad.net/~ted/indicator-messages/indicator-update/+merge/14459
proposed by: Ted Gould (ted)
revno: 154 [merge]
committer: Ted Gould t...@canonical.com
branch nick: trunk
timestamp: Thu 2009-11-05 09:28:42 -0600
message:
Moving to the libindicator 0.3.0 API
modified:
configure.ac
src/indicator-messages.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 2009-10-08 14:27:16 +
+++ configure.ac 2009-11-04 21:00:19 +
@@ -29,7 +29,7 @@
GIO_UNIX_REQUIRED_VERSION=2.18
PANEL_REQUIRED_VERSION=2.0.0
INDICATE_REQUIRED_VERSION=0.2.0
-INDICATOR_REQUIRED_VERSION=0.2.0
+INDICATOR_REQUIRED_VERSION=0.3.0
DBUSMENUGTK_REQUIRED_VERSION=0.1.1
PKG_CHECK_MODULES(APPLET, gtk+-2.0 = $GTK_REQUIRED_VERSION
=== modified file 'src/indicator-messages.c'
--- src/indicator-messages.c 2009-10-01 21:33:00 +
+++ src/indicator-messages.c 2009-11-04 21:20:36 +
@@ -22,6 +22,7 @@
#include string.h
#include glib.h
+#include glib-object.h
#include gtk/gtk.h
#include libdbusmenu-gtk/menu.h
#include libdbusmenu-gtk/menuitem.h
@@ -29,21 +30,88 @@
#include dbus/dbus-glib-bindings.h
#include libindicator/indicator.h
-INDICATOR_SET_VERSION
-INDICATOR_SET_NAME(messages)
+#include libindicator/indicator-object.h
#include dbus-data.h
#include messages-service-client.h
+#define INDICATOR_MESSAGES_TYPE(indicator_messages_get_type ())
+#define INDICATOR_MESSAGES(obj)(G_TYPE_CHECK_INSTANCE_CAST ((obj), INDICATOR_MESSAGES_TYPE, IndicatorMessages))
+#define INDICATOR_MESSAGES_CLASS(klass)(G_TYPE_CHECK_CLASS_CAST ((klass), INDICATOR_MESSAGES_TYPE, IndicatorMessagesClass))
+#define IS_INDICATOR_MESSAGES(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), INDICATOR_MESSAGES_TYPE))
+#define IS_INDICATOR_MESSAGES_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), INDICATOR_MESSAGES_TYPE))
+#define INDICATOR_MESSAGES_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), INDICATOR_MESSAGES_TYPE, IndicatorMessagesClass))
+
+typedef struct _IndicatorMessages IndicatorMessages;
+typedef struct _IndicatorMessagesClass IndicatorMessagesClass;
+
+struct _IndicatorMessagesClass {
+ IndicatorObjectClass parent_class;
+};
+
+struct _IndicatorMessages {
+ IndicatorObject parent;
+};
+
+GType indicator_messages_get_type (void);
+
+/* Indicator Module Config */
+INDICATOR_SET_VERSION
+INDICATOR_SET_TYPE(INDICATOR_MESSAGES_TYPE)
+
+/* Globals */
static GtkWidget * main_image = NULL;
-
#define DESIGN_TEAM_SIZE design_team_size
static GtkIconSize design_team_size;
-
static DBusGProxy * icon_proxy = NULL;
-
static GtkSizeGroup * indicator_right_group = NULL;
+/* Prototypes */
+static void indicator_messages_class_init (IndicatorMessagesClass *klass);
+static void indicator_messages_init (IndicatorMessages *self);
+static void indicator_messages_dispose(GObject *object);
+static void indicator_messages_finalize (GObject *object);
+static GtkImage * get_icon(IndicatorObject * io);
+static GtkMenu * get_menu (IndicatorObject * io);
+
+G_DEFINE_TYPE (IndicatorMessages, indicator_messages, INDICATOR_OBJECT_TYPE);
+
+static void
+indicator_messages_class_init (IndicatorMessagesClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+ object_class-dispose = indicator_messages_dispose;
+ object_class-finalize = indicator_messages_finalize;
+
+ IndicatorObjectClass * io_class = INDICATOR_OBJECT_CLASS(klass);
+
+ io_class-get_image = get_icon;
+ io_class-get_menu = get_menu;
+
+ return;
+}
+
+static void
+indicator_messages_init (IndicatorMessages *self)
+{
+}
+
+static void
+indicator_messages_dispose (GObject *object)
+{
+G_OBJECT_CLASS (indicator_messages_parent_class)-dispose (object);
+}
+
+static void
+indicator_messages_finalize (GObject *object)
+{
+G_OBJECT_CLASS (indicator_messages_parent_class)-finalize (object);
+}
+
+
+
+/* Functions */
static void
attention_changed_cb (DBusGProxy * proxy, gboolean dot, gpointer userdata)
{
@@ -303,14 +371,8 @@
return TRUE;
}
-GtkLabel *
-get_label (void)
-{
- return NULL;
-}
-
-GtkImage *
-get_icon (void)
+static GtkImage *
+get_icon (IndicatorObject * io)
{
design_team_size = gtk_icon_size_register(design-team-size, 22, 22);
@@ -320,8 +382,8 @@
return GTK_IMAGE(main_image);
}
-GtkMenu *
-get_menu (void)
+static GtkMenu *
+get_menu (IndicatorObject * io)
{
guint returnval = 0;
GError * error = NULL;
___
Mailing list: https://launchpad.net/~ayatana-commits
Post to :
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 155: Disabling static builds because we don't need them, and they seem to cause errors on amd64.
revno: 155 committer: Ted Gould t...@canonical.com branch nick: trunk timestamp: Thu 2009-11-05 21:32:14 -0600 message: Disabling static builds because we don't need them, and they seem to cause errors on amd64. modified: configure.ac -- 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 2009-11-04 21:00:19 + +++ configure.ac 2009-11-06 03:32:14 + @@ -15,6 +15,7 @@ AM_PROG_CC_C_O AC_STDC_HEADERS AC_PROG_LIBTOOL +AC_DISABLE_STATIC AC_SUBST(VERSION) AC_CONFIG_MACRO_DIR([m4]) ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 152: 0.2.6
revno: 152 tags: 0.2.6 committer: Ted Gould t...@canonical.com branch nick: trunk timestamp: Thu 2009-10-08 10:27:16 -0400 message: 0.2.6 modified: configure.ac -- 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 2009-10-01 20:34:56 + +++ configure.ac 2009-10-08 14:27:16 + @@ -4,7 +4,7 @@ AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-messages, 0.2.5) +AM_INIT_AUTOMAKE(indicator-messages, 0.2.6) AM_MAINTAINER_MODE ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 149: 0.2.5
revno: 149 tags: 0.2.5 committer: Ted Gould t...@canonical.com branch nick: trunk timestamp: Thu 2009-10-01 15:34:56 -0500 message: 0.2.5 modified: configure.ac -- 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 2009-09-25 01:25:44 + +++ configure.ac 2009-10-01 20:34:56 + @@ -4,7 +4,7 @@ AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-messages, 0.2.4) +AM_INIT_AUTOMAKE(indicator-messages, 0.2.5) AM_MAINTAINER_MODE ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 150: Stupid ordering, just asking for a memory leak.
revno: 150
committer: Ted Gould t...@canonical.com
branch nick: trunk
timestamp: Thu 2009-10-01 16:33:00 -0500
message:
Stupid ordering, just asking for a memory leak.
modified:
src/indicator-messages.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 'src/indicator-messages.c'
--- src/indicator-messages.c 2009-09-24 17:41:53 +
+++ src/indicator-messages.c 2009-10-01 21:33:00 +
@@ -202,12 +202,12 @@
static gboolean
new_indicator_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client)
{
+ g_return_val_if_fail(DBUSMENU_IS_MENUITEM(newitem), FALSE);
+ g_return_val_if_fail(DBUSMENU_IS_GTKCLIENT(client), FALSE);
+ /* Note: not checking parent, it's reasonable for it to be NULL */
+
indicator_item_t * mi_data = g_new0(indicator_item_t, 1);
- g_return_val_if_fail(DBUSMENU_IS_MENUITEM(newitem), FALSE);
- g_return_val_if_fail(DBUSMENU_IS_GTKCLIENT(client), FALSE);
- /* Note: not checking parent, it's reasonable for it to be NULL */
-
GtkMenuItem * gmi = GTK_MENU_ITEM(gtk_menu_item_new());
GtkWidget * hbox = gtk_hbox_new(FALSE, 4);
___
Mailing list: https://launchpad.net/~ayatana-commits
Post to : ayatana-commits@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ayatana-commits
More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 148: Adding in a check to see if the time was set, if not, don't display it in the menu item.
Merge authors:
Ted Gould (ted)
Related merge proposals:
https://code.launchpad.net/~ted/indicator-messages/mark-time/+merge/12634
proposed by: Ted Gould (ted)
review: Approve - Neil J. Patel (njpatel)
revno: 148 [merge]
committer: Ted Gould t...@canonical.com
branch nick: trunk
timestamp: Wed 2009-09-30 12:03:35 -0500
message:
Adding in a check to see if the time was set, if not, don't display it in the
menu item.
modified:
src/im-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 'src/im-menu-item.c'
--- src/im-menu-item.c 2009-09-09 15:03:33 +
+++ src/im-menu-item.c 2009-09-29 21:46:18 +
@@ -47,6 +47,7 @@
IndicateListenerServer * server;
IndicateListenerIndicator * indicator;
+ glong creation_seconds;
glong seconds;
gchar * count;
gulong indicator_changed;
@@ -132,13 +133,14 @@
priv-indicator = NULL;
/* A sane default, but look below */
+ priv-creation_seconds = 0;
priv-seconds = 0;
/* Set the seconds to be the time when the item was
created incase we're not given a better time. */
GTimeVal current_time;
g_get_current_time(current_time);
- priv-seconds = current_time.tv_sec;
+ priv-creation_seconds = current_time.tv_sec;
return;
}
@@ -185,9 +187,17 @@
{
ImMenuItemPrivate * priv = IM_MENU_ITEM_GET_PRIVATE(self);
+ /* Count has been set, so it takes priority. */
if (priv-count != NULL) {
return;
}
+
+ /* Seconds hasn't been set, so we just want to keep the time
+ area blank. */
+ if (priv-seconds == 0) {
+ dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), INDICATOR_MENUITEM_PROP_RIGHT, );
+ return;
+ }
gchar * timestring = NULL;
@@ -449,7 +459,12 @@
g_return_val_if_fail(IS_IM_MENU_ITEM(menuitem), 0);
ImMenuItemPrivate * priv = IM_MENU_ITEM_GET_PRIVATE(menuitem);
- return priv-seconds;
+
+ if (priv-seconds == 0) {
+ return priv-creation_seconds;
+ } else {
+ return priv-seconds;
+ }
}
/* Gets whether or not this indicator item is
___
Mailing list: https://launchpad.net/~ayatana-commits
Post to : ayatana-commits@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ayatana-commits
More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 143: Merging in the icon scaling branch
Merge authors:
Ted Gould (ted)
Related merge proposals:
https://code.launchpad.net/~ted/indicator-messages/icon-scaling/+merge/12303
proposed by: Ted Gould (ted)
review: Approve - David Barth (dbarth)
revno: 143 [merge]
committer: Ted Gould t...@canonical.com
branch nick: trunk
timestamp: Thu 2009-09-24 12:35:47 -0500
message:
Merging in the icon scaling branch
modified:
src/indicator-messages.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 'src/indicator-messages.c'
--- src/indicator-messages.c 2009-09-09 01:20:45 +
+++ src/indicator-messages.c 2009-09-23 18:22:08 +
@@ -164,7 +164,29 @@
is already cached, shouldn't be a big deal really. */
GdkPixbuf * pixbuf = dbusmenu_menuitem_property_get_image(mi, INDICATOR_MENUITEM_PROP_ICON);
if (pixbuf != NULL) {
- gtk_image_set_from_pixbuf(GTK_IMAGE(mi_data-icon), pixbuf);
+ /* If we've got a pixbuf we need to make sure it's of a reasonable
+ size to fit in the menu. If not, rescale it. */
+ GdkPixbuf * resized_pixbuf;
+ gint width, height;
+ gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, width, height);
+ if (gdk_pixbuf_get_width(pixbuf) width ||
+ gdk_pixbuf_get_height(pixbuf) height) {
+g_debug(Resizing icon from %dx%d to %dx%d, gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf), width, height);
+resized_pixbuf = gdk_pixbuf_scale_simple(pixbuf,
+ width,
+ height,
+ GDK_INTERP_BILINEAR);
+ } else {
+g_debug(Happy with icon sized %dx%d, gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf));
+resized_pixbuf = pixbuf;
+ }
+
+ gtk_image_set_from_pixbuf(GTK_IMAGE(mi_data-icon), resized_pixbuf);
+
+ /* The other pixbuf should be free'd by the dbusmenu. */
+ if (resized_pixbuf != pixbuf) {
+g_object_unref(resized_pixbuf);
+ }
}
} else {
g_warning(Indicator Item property '%s' unknown, prop);
@@ -194,7 +216,29 @@
mi_data-icon = gtk_image_new();
GdkPixbuf * pixbuf = dbusmenu_menuitem_property_get_image(newitem, INDICATOR_MENUITEM_PROP_ICON);
if (pixbuf != NULL) {
- gtk_image_set_from_pixbuf(GTK_IMAGE(mi_data-icon), pixbuf);
+ /* If we've got a pixbuf we need to make sure it's of a reasonable
+ size to fit in the menu. If not, rescale it. */
+ GdkPixbuf * resized_pixbuf;
+ gint width, height;
+ gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, width, height);
+ if (gdk_pixbuf_get_width(pixbuf) width ||
+ gdk_pixbuf_get_height(pixbuf) height) {
+ g_debug(Resizing icon from %dx%d to %dx%d, gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf), width, height);
+ resized_pixbuf = gdk_pixbuf_scale_simple(pixbuf,
+ width,
+ height,
+ GDK_INTERP_BILINEAR);
+ } else {
+ g_debug(Happy with icon sized %dx%d, gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf));
+ resized_pixbuf = pixbuf;
+ }
+
+ gtk_image_set_from_pixbuf(GTK_IMAGE(mi_data-icon), resized_pixbuf);
+
+ /* The other pixbuf should be free'd by the dbusmenu. */
+ if (resized_pixbuf != pixbuf) {
+ g_object_unref(resized_pixbuf);
+ }
}
gtk_misc_set_alignment(GTK_MISC(mi_data-icon), 0.0, 0.5);
gtk_box_pack_start(GTK_BOX(hbox), mi_data-icon, FALSE, FALSE, 0);
___
Mailing list: https://launchpad.net/~ayatana-commits
Post to : ayatana-commits@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ayatana-commits
More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 145: Making a 0.2.4
revno: 145 tags: 0.2.4 committer: Ted Gould t...@canonical.com branch nick: trunk timestamp: Thu 2009-09-24 13:04:30 -0500 message: Making a 0.2.4 modified: configure.ac -- 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 2009-09-17 14:58:02 + +++ configure.ac 2009-09-24 18:04:30 + @@ -4,7 +4,7 @@ AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-messages, 0.2.3) +AM_INIT_AUTOMAKE(indicator-messages, 0.2.4) AM_MAINTAINER_MODE ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 141: Merging in branch to add a path for indicators in /usr/share and make it so that invalid desktop ...
Merge authors:
Ted Gould (ted)
Related merge proposals:
https://code.launchpad.net/~ted/indicator-messages/path-change/+merge/12297
proposed by: Ted Gould (ted)
review: Approve - Neil J. Patel (njpatel)
revno: 141 [merge]
committer: Ted Gould t...@canonical.com
branch nick: trunk
timestamp: Wed 2009-09-23 13:28:44 -0500
message:
Merging in branch to add a path for indicators in /usr/share and make it so
that invalid desktop files don't create visible menu items.
modified:
src/dirs.h
src/launcher-menu-item.c
src/messages-service.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 'src/dirs.h'
--- src/dirs.h 2009-08-19 18:50:16 +
+++ src/dirs.h 2009-09-23 16:06:01 +
@@ -1,3 +1,4 @@
-#define SYSTEM_APPS_DIR/etc/indicators/messages/applications
+#define SYSTEM_APPS_DIR/usr/share/indicators/messages/applications
+#define SYSTEM_APPS_DIR_OLD/etc/indicators/messages/applications
#define USER_APPS_DIR indicators/messages/applications
#define USER_BLACKLIST_DIR indicators/messages/applications-blacklist
=== modified file 'src/launcher-menu-item.c'
--- src/launcher-menu-item.c 2009-08-27 01:53:29 +
+++ src/launcher-menu-item.c 2009-09-23 16:48:09 +
@@ -137,6 +137,10 @@
g_signal_connect(G_OBJECT(self), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(activate_cb), NULL);
+ if (priv-appinfo == NULL) {
+ launcher_menu_item_set_eclipsed(self, TRUE);
+ }
+
return self;
}
=== modified file 'src/messages-service.c'
--- src/messages-service.c 2009-09-15 21:17:44 +
+++ src/messages-service.c 2009-09-23 16:48:09 +
@@ -1148,7 +1148,10 @@
dbusmenu_menuitem_child_append(root_menuitem, DBUSMENU_MENUITEM(ll-separator));
resort_menu(root_menuitem);
- if (blacklist_check(launcher_menu_item_get_desktop(ll-menuitem))) {
+ /* If we're in the black list or we've gotten eclipsed
+ by something else, hide the item and the separator. */
+ if (blacklist_check(launcher_menu_item_get_desktop(ll-menuitem)) ||
+launcher_menu_item_get_eclipsed(ll-menuitem)) {
launcher_menu_item_set_eclipsed(ll-menuitem, TRUE);
dbusmenu_menuitem_property_set(ll-separator, DBUSMENU_MENUITEM_PROP_VISIBLE, false);
}
@@ -1244,6 +1247,7 @@
g_idle_add(blacklist_init, NULL);
g_idle_add(build_launchers, SYSTEM_APPS_DIR);
+ g_idle_add(build_launchers, SYSTEM_APPS_DIR_OLD);
gchar * userdir = g_build_filename(g_get_user_config_dir(), USER_APPS_DIR, NULL);
g_idle_add(build_launchers, userdir);
___
Mailing list: https://launchpad.net/~ayatana-commits
Post to : ayatana-commits@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ayatana-commits
More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 134: Putting the dbus service (correctly) in the libexec directory instead of the bin directory.
revno: 134 committer: Ted Gould t...@canonical.com branch nick: trunk timestamp: Wed 2009-09-09 09:52:36 -0500 message: Putting the dbus service (correctly) in the libexec directory instead of the bin directory. modified: configure.ac data/Makefile.am data/indicator-messages.service.in src/Makefile.am -- 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 2009-09-09 14:18:53 + +++ configure.ac 2009-09-09 14:52:36 + @@ -75,7 +75,6 @@ Makefile src/Makefile data/Makefile -data/indicator-messages.service data/icons/Makefile data/icons/16x16/Makefile data/icons/16x16/status/Makefile === modified file 'data/Makefile.am' --- data/Makefile.am 2009-05-27 10:51:24 + +++ data/Makefile.am 2009-09-09 14:52:36 + @@ -2,3 +2,9 @@ dbus_servicesdir = $(DBUSSERVICEDIR) dbus_services_DATA = indicator-messages.service + +%.service: %.service.in + sed -e s|\...@libexecdir\@|$(libexecdir)| $ $@ + +EXTRA_DIST = indicator-messages.service.in + === modified file 'data/indicator-messages.service.in' --- data/indicator-messages.service.in 2009-08-26 15:40:35 + +++ data/indicator-messages.service.in 2009-09-09 14:52:36 + @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.ayatana.indicator.messages -ex...@prefix@/bin/indicator-messages-service +ex...@libexecdir@/indicator-messages-service === modified file 'src/Makefile.am' --- src/Makefile.am 2009-08-26 03:08:41 + +++ src/Makefile.am 2009-09-09 14:52:36 + @@ -1,5 +1,5 @@ -bin_PROGRAMS = indicator-messages-service +libexec_PROGRAMS = indicator-messages-service ## # Building the messages indicator ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 135: Making 0.2.1
revno: 135 tags: 0.2.1 committer: Ted Gould t...@canonical.com branch nick: trunk timestamp: Wed 2009-09-09 13:54:25 -0500 message: Making 0.2.1 modified: configure.ac -- 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 2009-09-09 14:52:36 + +++ configure.ac 2009-09-09 18:54:25 + @@ -4,7 +4,7 @@ AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-messages, 0.2.0) +AM_INIT_AUTOMAKE(indicator-messages, 0.2.1) AM_MAINTAINER_MODE ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-messages/trunk] Rev 136: Adding indicator-messages.service to the clean files for distcheck.
revno: 136 tags: 0.2.1 committer: Ted Gould t...@canonical.com branch nick: trunk timestamp: Wed 2009-09-09 13:58:33 -0500 message: Adding indicator-messages.service to the clean files for distcheck. modified: data/Makefile.am -- 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 'data/Makefile.am' --- data/Makefile.am 2009-09-09 14:52:36 + +++ data/Makefile.am 2009-09-09 18:58:33 + @@ -8,3 +8,4 @@ EXTRA_DIST = indicator-messages.service.in +CLEANFILES = indicator-messages.service ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
