diff options
| author | Ted Gould <ted@gould.cx> | 2011-01-27 14:53:57 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-01-27 14:53:57 -0600 |
| commit | 41981b1b0cc723c58e515702fc34cfd6bf500ae9 (patch) | |
| tree | e762d6405bdd99fbb8eb7be45522bfa51a7dd941 /example | |
| parent | be00d0092e640dcdb0c5a64f9a8a20178245b716 (diff) | |
| parent | 19c543fd42571ef3e011db21a6d93e93d7da4483 (diff) | |
| download | libayatana-appindicator-41981b1b0cc723c58e515702fc34cfd6bf500ae9.tar.gz libayatana-appindicator-41981b1b0cc723c58e515702fc34cfd6bf500ae9.tar.bz2 libayatana-appindicator-41981b1b0cc723c58e515702fc34cfd6bf500ae9.zip | |
Import upstream version 0.2.92
Diffstat (limited to 'example')
| -rw-r--r-- | example/Makefile.am | 8 | ||||
| -rw-r--r-- | example/Makefile.in | 13 | ||||
| -rw-r--r-- | example/simple-client.c | 5 |
3 files changed, 16 insertions, 10 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..f99848d 100644 --- a/example/Makefile.in +++ b/example/Makefile.in @@ -37,11 +37,8 @@ check_PROGRAMS = simple-client$(EXEEXT) subdir = example DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -52,7 +49,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 +254,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 +270,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); } |