diff options
| author | Ted Gould <ted@gould.cx> | 2011-01-27 08:56:41 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-01-27 08:56:41 -0600 |
| commit | 27ae7e26eec862442189eaf94ab2f559d8d28bb5 (patch) | |
| tree | daaf0a7f70b7b7921d925aa31bdf450c3b9b8d4c /example | |
| parent | 83b9ba8658f3bb4593a32c61eade547ac7bfe965 (diff) | |
| parent | ceb50bdad13b935da467d6913fa428fd9c8b1dda (diff) | |
| download | libayatana-appindicator-27ae7e26eec862442189eaf94ab2f559d8d28bb5.tar.gz libayatana-appindicator-27ae7e26eec862442189eaf94ab2f559d8d28bb5.tar.bz2 libayatana-appindicator-27ae7e26eec862442189eaf94ab2f559d8d28bb5.zip | |
* Upstream Merge
* Fixes to build system to build with GTK3
* Use the dbusmenu parser
Diffstat (limited to 'example')
| -rw-r--r-- | example/Makefile.am | 8 | ||||
| -rw-r--r-- | example/simple-client.c | 5 |
2 files changed, 10 insertions, 3 deletions
diff --git a/example/Makefile.am b/example/Makefile.am index e23e08d..0900baf 100644 --- a/example/Makefile.am +++ b/example/Makefile.am @@ -1,3 +1,9 @@ +if USE_GTK3 +VER=3 +else +VER= +endif + check_PROGRAMS = \ simple-client @@ -17,7 +23,7 @@ simple_client_CFLAGS = \ simple_client_LDADD = \ $(LIBRARY_LIBS) \ - $(top_builddir)/src/libappindicator.la + $(top_builddir)/src/libappindicator$(VER).la EXTRA_DIST = \ simple-client-test-icon.png diff --git a/example/simple-client.c b/example/simple-client.c index 734aff6..ac8360f 100644 --- a/example/simple-client.c +++ b/example/simple-client.c @@ -86,13 +86,14 @@ toggle_sensitivity_cb (GtkWidget *widget, gpointer data) { GtkWidget *target = (GtkWidget *)data; - gtk_widget_set_sensitive (target, !GTK_WIDGET_IS_SENSITIVE (target)); + gtk_widget_set_sensitive (target, !gtk_widget_is_sensitive (target)); } static void image_clicked_cb (GtkWidget *widget, gpointer data) { - gtk_image_set_from_stock (GTK_IMAGE (GTK_IMAGE_MENU_ITEM (widget)->image), + gtk_image_set_from_stock (GTK_IMAGE (gtk_image_menu_item_get_image ( + GTK_IMAGE_MENU_ITEM (widget))), GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU); } |