libappindicator

Merge lp:~ken-vandine/libappindicator/gtk3 into lp:libappindicator

  1. gtk3
  2. Merge into trunk
Proposed by Ken VanDine
Status: Merged
Merged at revision: 179
Proposed branch: lp:~ken-vandine/libappindicator/gtk3
Merge into: lp:libappindicator
Diff against target: 190 lines (+36/-14)
7 files modified
bindings/Makefile.am (+4/-0)
docs/reference/Makefile.am (+6/-1)
example/Makefile.am (+7/-1)
example/simple-client.c (+3/-2)
src/Makefile.am (+1/-1)
src/appindicator3-0.1.pc.in (+1/-1)
tests/Makefile.am (+14/-8)
To merge this branch: bzr merge lp:~ken-vandine/libappindicator/gtk3
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
Review via email: mp+47411@code.launchpad.net

Description of the change

More GTK fixes, the /indicator-application/libappindicator/set_menu test is failing though and I am not sure why.

To post a comment you must log in.
Revision history for this message
Ted Gould (ted) wrote :
Download full text (6.3 KiB)

  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...

Read more...

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1if USE_GTK3
2SUBDIRS = mono
3else
1SUBDIRS = \4SUBDIRS = \
2 mono \5 mono \
3 python6 python
7endif
48
=== 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 @@
9# of using the various options.9# of using the various options.
1010
11# The name of the module, e.g. 'glib'.11# The name of the module, e.g. 'glib'.
12if USE_GTK3
13DOC_MODULE=libappindicator3
14else
12DOC_MODULE=libappindicator15DOC_MODULE=libappindicator
16endif
17
1318
14# Uncomment for versioned docs and specify the version of the module, e.g. '2'.19# Uncomment for versioned docs and specify the version of the module, e.g. '2'.
15#DOC_MODULE_VERSION=220#DOC_MODULE_VERSION=2
@@ -91,7 +96,7 @@
91# e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)96# e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
92# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)97# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
93GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src $(LIBRARY_CFLAGS)98GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src $(LIBRARY_CFLAGS)
94GTKDOC_LIBS=$(top_builddir)/src/libappindicator.la $(LIBRARY_LIBS)99GTKDOC_LIBS=$(top_builddir)/src/$(DOC_MODULE).la $(LIBRARY_LIBS)
95100
96# This includes the standard gtk-doc make rules, copied by gtkdocize.101# This includes the standard gtk-doc make rules, copied by gtkdocize.
97include $(top_srcdir)/gtk-doc.local.make102include $(top_srcdir)/gtk-doc.local.make
98103
=== 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 @@
1if USE_GTK3
2VER=3
3else
4VER=
5endif
6
17
2check_PROGRAMS = \8check_PROGRAMS = \
3 simple-client9 simple-client
@@ -17,7 +23,7 @@
1723
18simple_client_LDADD = \24simple_client_LDADD = \
19 $(LIBRARY_LIBS) \25 $(LIBRARY_LIBS) \
20 $(top_builddir)/src/libappindicator.la26 $(top_builddir)/src/libappindicator$(VER).la
2127
22EXTRA_DIST = \28EXTRA_DIST = \
23 simple-client-test-icon.png29 simple-client-test-icon.png
2430
=== 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 @@
86{86{
87 GtkWidget *target = (GtkWidget *)data;87 GtkWidget *target = (GtkWidget *)data;
8888
89 gtk_widget_set_sensitive (target, !GTK_WIDGET_IS_SENSITIVE (target));89 gtk_widget_set_sensitive (target, !gtk_widget_is_sensitive (target));
90}90}
9191
92static void92static void
93image_clicked_cb (GtkWidget *widget, gpointer data)93image_clicked_cb (GtkWidget *widget, gpointer data)
94{94{
95 gtk_image_set_from_stock (GTK_IMAGE (GTK_IMAGE_MENU_ITEM (widget)->image),95 gtk_image_set_from_stock (GTK_IMAGE (gtk_image_menu_item_get_image (
96 GTK_IMAGE_MENU_ITEM (widget))),
96 GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU);97 GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU);
97}98}
9899
99100
=== 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 @@
4545
46DISTCLEANFILES += app-indicator-enum-types.c46DISTCLEANFILES += app-indicator-enum-types.c
4747
48libappindicatorincludedir=$(includedir)/libappindicator$(VER)-0.1/libappindicator48libappindicatorincludedir=$(includedir)/libappindicator-0.1/libappindicator
4949
50libappindicator_headers = \50libappindicator_headers = \
51 app-indicator.h51 app-indicator.h
5252
=== 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 @@
4bindir=@bindir@4bindir=@bindir@
5includedir=@includedir@5includedir=@includedir@
66
7Cflags: -I${includedir}/libappindicator3-0.17Cflags: -I${includedir}/libappindicator-0.1
8Requires: dbusmenu-glib-0.4 gtk+-3.08Requires: dbusmenu-glib-0.4 gtk+-3.0
9Libs: -L${libdir} -lappindicator39Libs: -L${libdir} -lappindicator3
1010
1111
=== 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 @@
1if USE_GTK3
2VER=3
3else
4VER=
5endif
6
17
2check_PROGRAMS = \8check_PROGRAMS = \
3 test-libappindicator \9 test-libappindicator \
@@ -31,7 +37,7 @@
3137
32test_libappindicator_LDADD = \38test_libappindicator_LDADD = \
33 $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \39 $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
34 $(top_builddir)/src/libappindicator.la40 $(top_builddir)/src/libappindicator$(VER).la
3541
36#########################################42#########################################
37## test-libappindicator-dbus-client43## test-libappindicator-dbus-client
@@ -48,7 +54,7 @@
4854
49test_libappindicator_dbus_client_LDADD = \55test_libappindicator_dbus_client_LDADD = \
50 $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \56 $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
51 $(top_builddir)/src/libappindicator.la57 $(top_builddir)/src/libappindicator$(VER).la
5258
53#########################################59#########################################
54## test-libappindicator-dbus-server60## test-libappindicator-dbus-server
@@ -65,7 +71,7 @@
6571
66test_libappindicator_dbus_server_LDADD = \72test_libappindicator_dbus_server_LDADD = \
67 $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \73 $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
68 $(top_builddir)/src/libappindicator.la74 $(top_builddir)/src/libappindicator$(VER).la
6975
70#########################################76#########################################
71## test-libappindicator-status-client77## test-libappindicator-status-client
@@ -82,7 +88,7 @@
8288
83test_libappindicator_status_client_LDADD = \89test_libappindicator_status_client_LDADD = \
84 $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \90 $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
85 $(top_builddir)/src/libappindicator.la91 $(top_builddir)/src/libappindicator$(VER).la
8692
87#########################################93#########################################
88## test-libappindicator-status-server94## test-libappindicator-status-server
@@ -99,7 +105,7 @@
99105
100test_libappindicator_status_server_LDADD = \106test_libappindicator_status_server_LDADD = \
101 $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \107 $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
102 $(top_builddir)/src/libappindicator.la108 $(top_builddir)/src/libappindicator$(VER).la
103109
104#########################################110#########################################
105## test-libappindicator-fallback111## test-libappindicator-fallback
@@ -115,7 +121,7 @@
115121
116test_libappindicator_fallback_watcher_LDADD = \122test_libappindicator_fallback_watcher_LDADD = \
117 $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \123 $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
118 $(top_builddir)/src/libappindicator.la124 $(top_builddir)/src/libappindicator$(VER).la
119125
120test_libappindicator_fallback_item_SOURCES = \126test_libappindicator_fallback_item_SOURCES = \
121 test-libappindicator-fallback-item.c127 test-libappindicator-fallback-item.c
@@ -127,7 +133,7 @@
127133
128test_libappindicator_fallback_item_LDADD = \134test_libappindicator_fallback_item_LDADD = \
129 $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \135 $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
130 $(top_builddir)/src/libappindicator.la136 $(top_builddir)/src/libappindicator$(VER).la
131137
132test-libappindicator-fallback: test-libappindicator-fallback-watcher test-libappindicator-fallback-item Makefile.am138test-libappindicator-fallback: test-libappindicator-fallback-watcher test-libappindicator-fallback-item Makefile.am
133 @echo "#!/bin/bash" > $@139 @echo "#!/bin/bash" > $@
@@ -192,5 +198,5 @@
192198
193test_simple_app_LDADD = \199test_simple_app_LDADD = \
194 $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \200 $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
195 $(top_builddir)/src/libappindicator.la201 $(top_builddir)/src/libappindicator$(VER).la
196202

Subscribers

People subscribed via source and target branches