diff options
Diffstat (limited to 'example')
| -rw-r--r-- | example/Makefile.am | 8 | ||||
| -rw-r--r-- | example/Makefile.in | 6 | ||||
| -rw-r--r-- | example/simple-client.c | 5 |
3 files changed, 14 insertions, 5 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/Makefile.in b/example/Makefile.in index 0337245..b603fa4 100644 --- a/example/Makefile.in +++ b/example/Makefile.in @@ -52,7 +52,7 @@ am_simple_client_OBJECTS = simple_client-simple-client.$(OBJEXT) simple_client_OBJECTS = $(am_simple_client_OBJECTS) am__DEPENDENCIES_1 = simple_client_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(top_builddir)/src/libappindicator.la + $(top_builddir)/src/libappindicator$(VER).la AM_V_lt = $(am__v_lt_$(V)) am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) am__v_lt_0 = --silent @@ -257,6 +257,8 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +@USE_GTK3_FALSE@VER = +@USE_GTK3_TRUE@VER = 3 ######################################### ######################################### @@ -271,7 +273,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); } |