From 29ab06e930143eea6fd4fb2025f0c7cfc9caa76d Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 25 Jan 2011 10:52:54 -0500 Subject: Don't build python bindings for gtk3 --- bindings/Makefile.am | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bindings/Makefile.am b/bindings/Makefile.am index 71abb6c..f74dec5 100644 --- a/bindings/Makefile.am +++ b/bindings/Makefile.am @@ -1,3 +1,7 @@ +if USE_GTK3 +SUBDIRS = mono +else SUBDIRS = \ mono \ python +endif -- cgit v1.2.3 From b7e634a2f424f45f9b3b98ee991068edb11b5424 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 25 Jan 2011 10:53:26 -0500 Subject: Fixed includedir, we don't ship separate headers for the gtk3 build --- src/appindicator3-0.1.pc.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/appindicator3-0.1.pc.in b/src/appindicator3-0.1.pc.in index f59ac70..0ffe409 100644 --- a/src/appindicator3-0.1.pc.in +++ b/src/appindicator3-0.1.pc.in @@ -4,7 +4,7 @@ libdir=@libdir@ bindir=@bindir@ includedir=@includedir@ -Cflags: -I${includedir}/libappindicator3-0.1 +Cflags: -I${includedir}/libappindicator-0.1 Requires: dbusmenu-glib-0.4 gtk+-3.0 Libs: -L${libdir} -lappindicator3 -- cgit v1.2.3 From c5195ae53f4956c40b65516bcc4810aa94f985a7 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 25 Jan 2011 10:53:55 -0500 Subject: GTK3 fixes --- docs/reference/Makefile.am | 7 ++++++- example/Makefile.am | 8 +++++++- example/simple-client.c | 5 +++-- src/Makefile.am | 2 +- tests/Makefile.am | 22 ++++++++++++++-------- 5 files changed, 31 insertions(+), 13 deletions(-) diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index b6b0289..ae23e0b 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -9,7 +9,12 @@ AUTOMAKE_OPTIONS = 1.6 # of using the various options. # The name of the module, e.g. 'glib'. +if USE_GTK3 +DOC_MODULE=libappindicator3 +else DOC_MODULE=libappindicator +endif + # Uncomment for versioned docs and specify the version of the module, e.g. '2'. #DOC_MODULE_VERSION=2 @@ -91,7 +96,7 @@ expand_content_files= # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src $(LIBRARY_CFLAGS) -GTKDOC_LIBS=$(top_builddir)/src/libappindicator.la $(LIBRARY_LIBS) +GTKDOC_LIBS=$(top_builddir)/src/$(DOC_MODULE).la $(LIBRARY_LIBS) # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.local.make 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); } diff --git a/src/Makefile.am b/src/Makefile.am index 069247f..b9ee3e1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -45,7 +45,7 @@ glib_enum_headers = $(addprefix $(srcdir)/, $(libappindicator_headers)) DISTCLEANFILES += app-indicator-enum-types.c -libappindicatorincludedir=$(includedir)/libappindicator$(VER)-0.1/libappindicator +libappindicatorincludedir=$(includedir)/libappindicator-0.1/libappindicator libappindicator_headers = \ app-indicator.h diff --git a/tests/Makefile.am b/tests/Makefile.am index 5e176b5..ed89981 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,3 +1,9 @@ +if USE_GTK3 +VER=3 +else +VER= +endif + check_PROGRAMS = \ test-libappindicator \ @@ -31,7 +37,7 @@ test_libappindicator_CFLAGS = \ test_libappindicator_LDADD = \ $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \ - $(top_builddir)/src/libappindicator.la + $(top_builddir)/src/libappindicator$(VER).la ######################################### ## test-libappindicator-dbus-client @@ -48,7 +54,7 @@ test_libappindicator_dbus_client_CFLAGS = \ test_libappindicator_dbus_client_LDADD = \ $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \ - $(top_builddir)/src/libappindicator.la + $(top_builddir)/src/libappindicator$(VER).la ######################################### ## test-libappindicator-dbus-server @@ -65,7 +71,7 @@ test_libappindicator_dbus_server_CFLAGS = \ test_libappindicator_dbus_server_LDADD = \ $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \ - $(top_builddir)/src/libappindicator.la + $(top_builddir)/src/libappindicator$(VER).la ######################################### ## test-libappindicator-status-client @@ -82,7 +88,7 @@ test_libappindicator_status_client_CFLAGS = \ test_libappindicator_status_client_LDADD = \ $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \ - $(top_builddir)/src/libappindicator.la + $(top_builddir)/src/libappindicator$(VER).la ######################################### ## test-libappindicator-status-server @@ -99,7 +105,7 @@ test_libappindicator_status_server_CFLAGS = \ test_libappindicator_status_server_LDADD = \ $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \ - $(top_builddir)/src/libappindicator.la + $(top_builddir)/src/libappindicator$(VER).la ######################################### ## test-libappindicator-fallback @@ -115,7 +121,7 @@ test_libappindicator_fallback_watcher_CFLAGS = \ test_libappindicator_fallback_watcher_LDADD = \ $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \ - $(top_builddir)/src/libappindicator.la + $(top_builddir)/src/libappindicator$(VER).la test_libappindicator_fallback_item_SOURCES = \ test-libappindicator-fallback-item.c @@ -127,7 +133,7 @@ test_libappindicator_fallback_item_CFLAGS = \ test_libappindicator_fallback_item_LDADD = \ $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \ - $(top_builddir)/src/libappindicator.la + $(top_builddir)/src/libappindicator$(VER).la test-libappindicator-fallback: test-libappindicator-fallback-watcher test-libappindicator-fallback-item Makefile.am @echo "#!/bin/bash" > $@ @@ -192,5 +198,5 @@ test_simple_app_CFLAGS = \ test_simple_app_LDADD = \ $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \ - $(top_builddir)/src/libappindicator.la + $(top_builddir)/src/libappindicator$(VER).la -- cgit v1.2.3