ayatana-commits team mailing list archive
-
ayatana-commits team
-
Mailing list archive
-
Message #02596
[Merge] lp:~ted/indicator-application/simple-client-full-path into lp:indicator-application
Ted Gould has proposed merging lp:~ted/indicator-application/simple-client-full-path into lp:indicator-application.
Requested reviews:
Indicator Applet Developers (indicator-applet-developers)
Add the ability for simple client to be able to send a local icon into the application indicator to test that it works.
--
https://code.launchpad.net/~ted/indicator-application/simple-client-full-path/+merge/40487
Your team ayatana-commits is subscribed to branch lp:indicator-application.
=== modified file 'example/Makefile.am'
--- example/Makefile.am 2009-11-30 19:12:49 +0000
+++ example/Makefile.am 2010-11-09 23:11:46 +0000
@@ -11,9 +11,13 @@
simple_client_CFLAGS = \
$(INDICATOR_CFLAGS) \
+ -DLOCAL_ICON="\"$(abs_srcdir)/simple-client-test-icon.png\"" \
-Wall -Werror \
-I$(top_srcdir)/src
simple_client_LDADD = \
$(INDICATOR_LIBS) \
$(top_builddir)/src/libappindicator.la
+
+EXTRA_DIST = \
+ simple-client-test-icon.png
=== added file 'example/simple-client-test-icon.png'
Binary files example/simple-client-test-icon.png 1970-01-01 00:00:00 +0000 and example/simple-client-test-icon.png 2010-11-09 23:11:46 +0000 differ
=== modified file 'example/simple-client.c'
--- example/simple-client.c 2010-08-05 19:45:50 +0000
+++ example/simple-client.c 2010-11-09 23:11:46 +0000
@@ -60,6 +60,20 @@
}
static void
+local_icon_toggle_cb (GtkWidget *widget, gpointer data)
+{
+ AppIndicator * ci = APP_INDICATOR(data);
+
+ if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) {
+ app_indicator_set_icon(ci, LOCAL_ICON);
+ } else {
+ app_indicator_set_icon(ci, "indicator-messages");
+ }
+
+ return;
+}
+
+static void
item_clicked_cb (GtkWidget *widget, gpointer data)
{
const gchar *text = (const gchar *)data;
@@ -192,6 +206,12 @@
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show(item);
+ item = gtk_check_menu_item_new_with_label ("Set Local Icon");
+ g_signal_connect (item, "activate",
+ G_CALLBACK (local_icon_toggle_cb), ci);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+ gtk_widget_show(item);
+
app_indicator_set_menu (ci, GTK_MENU (menu));
mainloop = g_main_loop_new(NULL, FALSE);
Follow ups