diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2011-02-03 12:49:01 +0100 |
|---|---|---|
| committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2011-02-03 12:49:01 +0100 |
| commit | b5660e8977f5d4ffa28bfe4cfe30e5d7cf4ce944 (patch) | |
| tree | 91d9e8441bda99a520e6bd24a82da1dece1142d0 /example | |
| parent | 0d97a5e6201be283ba2dd017297b71122c7f19e2 (diff) | |
| parent | 19c543fd42571ef3e011db21a6d93e93d7da4483 (diff) | |
| download | libayatana-appindicator-b5660e8977f5d4ffa28bfe4cfe30e5d7cf4ce944.tar.gz libayatana-appindicator-b5660e8977f5d4ffa28bfe4cfe30e5d7cf4ce944.tar.bz2 libayatana-appindicator-b5660e8977f5d4ffa28bfe4cfe30e5d7cf4ce944.zip | |
Merge against new trunk
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); } |