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
1=== modified file 'bindings/Makefile.am'
2--- bindings/Makefile.am 2009-12-16 19:32:39 +0000
3+++ bindings/Makefile.am 2011-01-25 16:06:53 +0000
4@@ -1,3 +1,7 @@
5+if USE_GTK3
6+SUBDIRS = mono
7+else
8 SUBDIRS = \
9 mono \
10 python
11+endif
12
13=== modified file 'docs/reference/Makefile.am'
14--- docs/reference/Makefile.am 2010-12-04 02:44:18 +0000
15+++ docs/reference/Makefile.am 2011-01-25 16:06:53 +0000
16@@ -9,7 +9,12 @@
17 # of using the various options.
18
19 # The name of the module, e.g. 'glib'.
20+if USE_GTK3
21+DOC_MODULE=libappindicator3
22+else
23 DOC_MODULE=libappindicator
24+endif
25+
26
27 # Uncomment for versioned docs and specify the version of the module, e.g. '2'.
28 #DOC_MODULE_VERSION=2
29@@ -91,7 +96,7 @@
30 # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
31 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
32 GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src $(LIBRARY_CFLAGS)
33-GTKDOC_LIBS=$(top_builddir)/src/libappindicator.la $(LIBRARY_LIBS)
34+GTKDOC_LIBS=$(top_builddir)/src/$(DOC_MODULE).la $(LIBRARY_LIBS)
35
36 # This includes the standard gtk-doc make rules, copied by gtkdocize.
37 include $(top_srcdir)/gtk-doc.local.make
38
39=== modified file 'example/Makefile.am'
40--- example/Makefile.am 2010-12-04 03:37:58 +0000
41+++ example/Makefile.am 2011-01-25 16:06:53 +0000
42@@ -1,3 +1,9 @@
43+if USE_GTK3
44+VER=3
45+else
46+VER=
47+endif
48+
49
50 check_PROGRAMS = \
51 simple-client
52@@ -17,7 +23,7 @@
53
54 simple_client_LDADD = \
55 $(LIBRARY_LIBS) \
56- $(top_builddir)/src/libappindicator.la
57+ $(top_builddir)/src/libappindicator$(VER).la
58
59 EXTRA_DIST = \
60 simple-client-test-icon.png
61
62=== modified file 'example/simple-client.c'
63--- example/simple-client.c 2010-11-09 23:01:37 +0000
64+++ example/simple-client.c 2011-01-25 16:06:53 +0000
65@@ -86,13 +86,14 @@
66 {
67 GtkWidget *target = (GtkWidget *)data;
68
69- gtk_widget_set_sensitive (target, !GTK_WIDGET_IS_SENSITIVE (target));
70+ gtk_widget_set_sensitive (target, !gtk_widget_is_sensitive (target));
71 }
72
73 static void
74 image_clicked_cb (GtkWidget *widget, gpointer data)
75 {
76- gtk_image_set_from_stock (GTK_IMAGE (GTK_IMAGE_MENU_ITEM (widget)->image),
77+ gtk_image_set_from_stock (GTK_IMAGE (gtk_image_menu_item_get_image (
78+ GTK_IMAGE_MENU_ITEM (widget))),
79 GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU);
80 }
81
82
83=== modified file 'src/Makefile.am'
84--- src/Makefile.am 2011-01-13 23:36:29 +0000
85+++ src/Makefile.am 2011-01-25 16:06:53 +0000
86@@ -45,7 +45,7 @@
87
88 DISTCLEANFILES += app-indicator-enum-types.c
89
90-libappindicatorincludedir=$(includedir)/libappindicator$(VER)-0.1/libappindicator
91+libappindicatorincludedir=$(includedir)/libappindicator-0.1/libappindicator
92
93 libappindicator_headers = \
94 app-indicator.h
95
96=== modified file 'src/appindicator3-0.1.pc.in'
97--- src/appindicator3-0.1.pc.in 2011-01-12 15:01:09 +0000
98+++ src/appindicator3-0.1.pc.in 2011-01-25 16:06:53 +0000
99@@ -4,7 +4,7 @@
100 bindir=@bindir@
101 includedir=@includedir@
102
103-Cflags: -I${includedir}/libappindicator3-0.1
104+Cflags: -I${includedir}/libappindicator-0.1
105 Requires: dbusmenu-glib-0.4 gtk+-3.0
106 Libs: -L${libdir} -lappindicator3
107
108
109=== modified file 'tests/Makefile.am'
110--- tests/Makefile.am 2010-12-08 21:58:26 +0000
111+++ tests/Makefile.am 2011-01-25 16:06:53 +0000
112@@ -1,3 +1,9 @@
113+if USE_GTK3
114+VER=3
115+else
116+VER=
117+endif
118+
119
120 check_PROGRAMS = \
121 test-libappindicator \
122@@ -31,7 +37,7 @@
123
124 test_libappindicator_LDADD = \
125 $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
126- $(top_builddir)/src/libappindicator.la
127+ $(top_builddir)/src/libappindicator$(VER).la
128
129 #########################################
130 ## test-libappindicator-dbus-client
131@@ -48,7 +54,7 @@
132
133 test_libappindicator_dbus_client_LDADD = \
134 $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
135- $(top_builddir)/src/libappindicator.la
136+ $(top_builddir)/src/libappindicator$(VER).la
137
138 #########################################
139 ## test-libappindicator-dbus-server
140@@ -65,7 +71,7 @@
141
142 test_libappindicator_dbus_server_LDADD = \
143 $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
144- $(top_builddir)/src/libappindicator.la
145+ $(top_builddir)/src/libappindicator$(VER).la
146
147 #########################################
148 ## test-libappindicator-status-client
149@@ -82,7 +88,7 @@
150
151 test_libappindicator_status_client_LDADD = \
152 $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
153- $(top_builddir)/src/libappindicator.la
154+ $(top_builddir)/src/libappindicator$(VER).la
155
156 #########################################
157 ## test-libappindicator-status-server
158@@ -99,7 +105,7 @@
159
160 test_libappindicator_status_server_LDADD = \
161 $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
162- $(top_builddir)/src/libappindicator.la
163+ $(top_builddir)/src/libappindicator$(VER).la
164
165 #########################################
166 ## test-libappindicator-fallback
167@@ -115,7 +121,7 @@
168
169 test_libappindicator_fallback_watcher_LDADD = \
170 $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
171- $(top_builddir)/src/libappindicator.la
172+ $(top_builddir)/src/libappindicator$(VER).la
173
174 test_libappindicator_fallback_item_SOURCES = \
175 test-libappindicator-fallback-item.c
176@@ -127,7 +133,7 @@
177
178 test_libappindicator_fallback_item_LDADD = \
179 $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
180- $(top_builddir)/src/libappindicator.la
181+ $(top_builddir)/src/libappindicator$(VER).la
182
183 test-libappindicator-fallback: test-libappindicator-fallback-watcher test-libappindicator-fallback-item Makefile.am
184 @echo "#!/bin/bash" > $@
185@@ -192,5 +198,5 @@
186
187 test_simple_app_LDADD = \
188 $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
189- $(top_builddir)/src/libappindicator.la
190+ $(top_builddir)/src/libappindicator$(VER).la
191

Subscribers

People subscribed via source and target branches