review approve
On Tue, 2011-01-25 at 16:07 +0000, Ken VanDine wrote: > Ken VanDine has proposed merging lp:~ken-vandine/libappindicator/gtk3 into lp:libappindicator. > > Requested reviews: > Indicator Applet Developers (indicator-applet-developers) > > For more details, see: > https://code.launchpad.net/~ken-vandine/libappindicator/gtk3/+merge/47411 > > More GTK fixes, the /indicator-application/libappindicator/set_menu test is failing though and I am not sure why. > differences between files attachment (review-diff.txt) > === modified file 'bindings/Makefile.am' > --- bindings/Makefile.am 2009-12-16 19:32:39 +0000 > +++ bindings/Makefile.am 2011-01-25 16:06:53 +0000 > @@ -1,3 +1,7 @@ > +if USE_GTK3 > +SUBDIRS = mono > +else > SUBDIRS = \ > mono \ > python > +endif > > === modified file 'docs/reference/Makefile.am' > --- docs/reference/Makefile.am 2010-12-04 02:44:18 +0000 > +++ docs/reference/Makefile.am 2011-01-25 16:06:53 +0000 > @@ -9,7 +9,12 @@ > # 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 @@ > # 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 > > === modified file 'example/Makefile.am' > --- example/Makefile.am 2010-12-04 03:37:58 +0000 > +++ example/Makefile.am 2011-01-25 16:06:53 +0000 > @@ -1,3 +1,9 @@ > +if USE_GTK3 > +VER=3 > +else > +VER= > +endif > + > > check_PROGRAMS = \ > simple-client > @@ -17,7 +23,7 @@ > > simple_client_LDADD = \ > $(LIBRARY_LIBS) \ > - $(top_builddir)/src/libappindicator.la > + $(top_builddir)/src/libappindicator$(VER).la > > EXTRA_DIST = \ > simple-client-test-icon.png > > === modified file 'example/simple-client.c' > --- example/simple-client.c 2010-11-09 23:01:37 +0000 > +++ example/simple-client.c 2011-01-25 16:06:53 +0000 > @@ -86,13 +86,14 @@ > { > 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); > } > > > === modified file 'src/Makefile.am' > --- src/Makefile.am 2011-01-13 23:36:29 +0000 > +++ src/Makefile.am 2011-01-25 16:06:53 +0000 > @@ -45,7 +45,7 @@ > > DISTCLEANFILES += app-indicator-enum-types.c > > -libappindicatorincludedir=$(includedir)/libappindicator$(VER)-0.1/libappindicator > +libappindicatorincludedir=$(includedir)/libappindicator-0.1/libappindicator > > libappindicator_headers = \ > app-indicator.h > > === modified file 'src/appindicator3-0.1.pc.in' > --- src/appindicator3-0.1..pc.in 2011-01-12 15:01:09 +0000 > +++ src/appindicator3-0.1.pc.in 2011-01-25 16:06:53 +0000 > @@ -4,7 +4,7 @@ > 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 > > > === modified file 'tests/Makefile.am' > --- tests/Makefile.am 2010-12-08 21:58:26 +0000 > +++ tests/Makefile.am 2011-01-25 16:06:53 +0000 > @@ -1,3 +1,9 @@ > +if USE_GTK3 > +VER=3 > +else > +VER= > +endif > + > > check_PROGRAMS = \ > test-libappindicator \ > @@ -31,7 +37,7 @@ > > 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_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_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_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_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_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_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_LDADD = \ > $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \ > - $(top_builddir)/src/libappindicator.la > + $(top_builddir)/src/libappindicator$(VER).la > >
« Back to merge proposal
review approve
On Tue, 2011-01-25 at 16:07 +0000, Ken VanDine wrote: applet- developers) /code.launchpad .net/~ken- vandine/ libappindicator /gtk3/+ merge/47411 application/ libappindicator /set_menu test is failing though and I am not sure why. Makefile. am' Makefile. am 2009-12-16 19:32:39 +0000 Makefile. am 2011-01-25 16:06:53 +0000 /Makefile. am' Makefile. am 2010-12-04 02:44:18 +0000 Makefile. am 2011-01-25 16:06:53 +0000 libappindicator 3 libappindicator VERSION= 2 CFLAGS= -I$(top_ srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) LIBS=$( top_builddir) /gtk/$( gtktargetlib) CFLAGS= -I$(top_ srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src $(LIBRARY_CFLAGS) LIBS=$( top_builddir) /src/libappindi cator.la $(LIBRARY_LIBS) LIBS=$( top_builddir) /src/$( DOC_MODULE) .la $(LIBRARY_LIBS) /gtk-doc. local.make Makefile. am' /src/libappindi cator.la /src/libappindi cator$( VER).la client- test-icon. png simple- client. c' simple- client. c 2010-11-09 23:01:37 +0000 simple- client. c 2011-01-25 16:06:53 +0000 set_sensitive (target, !GTK_WIDGET_ IS_SENSITIVE (target)); set_sensitive (target, !gtk_widget_ is_sensitive (target)); set_from_ stock (GTK_IMAGE (GTK_IMAGE_ MENU_ITEM (widget)->image), set_from_ stock (GTK_IMAGE (gtk_image_ menu_item_ get_image ( SIZE_MENU) ; enum-types. c rincludedir= $(includedir) /libappindicato r$(VER) -0.1/libappindi cator rincludedir= $(includedir) /libappindicato r-0.1/libappind icator _headers = \ or3-0.1. pc.in' r3-0.1. .pc.in 2011-01-12 15:01:09 +0000 r3-0.1. pc.in 2011-01-25 16:06:53 +0000 @includedir@ /libappindicato r3-0.1 /libappindicato r-0.1 cator \ cator_LDADD = \ /src/libappindi cator.la /src/libappindi cator$( VER).la ####### ####### ####### ####### ###### cator-dbus- client cator_dbus_ client_ LDADD = \ /src/libappindi cator.la /src/libappindi cator$( VER).la ####### ####### ####### ####### ###### cator-dbus- server cator_dbus_ server_ LDADD = \ /src/libappindi cator.la /src/libappindi cator$( VER).la ####### ####### ####### ####### ###### cator-status- client cator_status_ client_ LDADD = \ /src/libappindi cator.la /src/libappindi cator$( VER).la ####### ####### ####### ####### ###### cator-status- server cator_status_ server_ LDADD = \ /src/libappindi cator.la /src/libappindi cator$( VER).la ####### ####### ####### ####### ###### cator-fallback cator_fallback_ watcher_ LDADD = \ /src/libappindi cator.la /src/libappindi cator$( VER).la cator_fallback_ item_SOURCES = \ cator-fallback- item.c cator_fallback_ item_LDADD = \ /src/libappindi cator.la /src/libappindi cator$( VER).la cator-fallback: test-libappindi cator-fallback- watcher test-libappindi cator-fallback- item Makefile.am app_LDADD = \ /src/libappindi cator.la /src/libappindi cator$( VER).la
> Ken VanDine has proposed merging lp:~ken-vandine/libappindicator/gtk3 into lp:libappindicator.
>
> Requested reviews:
> Indicator Applet Developers (indicator-
>
> For more details, see:
> https:/
>
> More GTK fixes, the /indicator-
> differences between files attachment (review-diff.txt)
> === modified file 'bindings/
> --- bindings/
> +++ bindings/
> @@ -1,3 +1,7 @@
> +if USE_GTK3
> +SUBDIRS = mono
> +else
> SUBDIRS = \
> mono \
> python
> +endif
>
> === modified file 'docs/reference
> --- docs/reference/
> +++ docs/reference/
> @@ -9,7 +9,12 @@
> # of using the various options.
>
> # The name of the module, e.g. 'glib'.
> +if USE_GTK3
> +DOC_MODULE=
> +else
> DOC_MODULE=
> +endif
> +
>
> # Uncomment for versioned docs and specify the version of the module, e.g. '2'.
> #DOC_MODULE_
> @@ -91,7 +96,7 @@
> # e.g. GTKDOC_
> # e.g. GTKDOC_
> GTKDOC_
> -GTKDOC_
> +GTKDOC_
>
> # This includes the standard gtk-doc make rules, copied by gtkdocize.
> include $(top_srcdir)
>
> === modified file 'example/
> --- example/Makefile.am 2010-12-04 03:37:58 +0000
> +++ example/Makefile.am 2011-01-25 16:06:53 +0000
> @@ -1,3 +1,9 @@
> +if USE_GTK3
> +VER=3
> +else
> +VER=
> +endif
> +
>
> check_PROGRAMS = \
> simple-client
> @@ -17,7 +23,7 @@
>
> simple_client_LDADD = \
> $(LIBRARY_LIBS) \
> - $(top_builddir)
> + $(top_builddir)
>
> EXTRA_DIST = \
> simple-
>
> === modified file 'example/
> --- example/
> +++ example/
> @@ -86,13 +86,14 @@
> {
> GtkWidget *target = (GtkWidget *)data;
>
> - gtk_widget_
> + gtk_widget_
> }
>
> static void
> image_clicked_cb (GtkWidget *widget, gpointer data)
> {
> - gtk_image_
> + gtk_image_
> + GTK_IMAGE_MENU_ITEM (widget))),
> GTK_STOCK_OPEN, GTK_ICON_
> }
>
>
> === modified file 'src/Makefile.am'
> --- src/Makefile.am 2011-01-13 23:36:29 +0000
> +++ src/Makefile.am 2011-01-25 16:06:53 +0000
> @@ -45,7 +45,7 @@
>
> DISTCLEANFILES += app-indicator-
>
> -libappindicato
> +libappindicato
>
> libappindicator
> app-indicator.h
>
> === modified file 'src/appindicat
> --- src/appindicato
> +++ src/appindicato
> @@ -4,7 +4,7 @@
> bindir=@bindir@
> includedir=
>
> -Cflags: -I${includedir}
> +Cflags: -I${includedir}
> Requires: dbusmenu-glib-0.4 gtk+-3.0
> Libs: -L${libdir} -lappindicator3
>
>
> === modified file 'tests/Makefile.am'
> --- tests/Makefile.am 2010-12-08 21:58:26 +0000
> +++ tests/Makefile.am 2011-01-25 16:06:53 +0000
> @@ -1,3 +1,9 @@
> +if USE_GTK3
> +VER=3
> +else
> +VER=
> +endif
> +
>
> check_PROGRAMS = \
> test-libappindi
> @@ -31,7 +37,7 @@
>
> test_libappindi
> $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
> - $(top_builddir)
> + $(top_builddir)
>
> #######
> ## test-libappindi
> @@ -48,7 +54,7 @@
>
> test_libappindi
> $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
> - $(top_builddir)
> + $(top_builddir)
>
> #######
> ## test-libappindi
> @@ -65,7 +71,7 @@
>
> test_libappindi
> $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
> - $(top_builddir)
> + $(top_builddir)
>
> #######
> ## test-libappindi
> @@ -82,7 +88,7 @@
>
> test_libappindi
> $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
> - $(top_builddir)
> + $(top_builddir)
>
> #######
> ## test-libappindi
> @@ -99,7 +105,7 @@
>
> test_libappindi
> $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
> - $(top_builddir)
> + $(top_builddir)
>
> #######
> ## test-libappindi
> @@ -115,7 +121,7 @@
>
> test_libappindi
> $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
> - $(top_builddir)
> + $(top_builddir)
>
> test_libappindi
> test-libappindi
> @@ -127,7 +133,7 @@
>
> test_libappindi
> $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
> - $(top_builddir)
> + $(top_builddir)
>
> test-libappindi
> @echo "#!/bin/bash" > $@
> @@ -192,5 +198,5 @@
>
> test_simple_
> $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
> - $(top_builddir)
> + $(top_builddir)
>
>