Merge lp:~kelemeng/indicator-sound/bug957517 into lp:indicator-sound/fifth

Proposed by Gabor Kelemen
Status: Merged
Approved by: Charles Kerr
Approved revision: 312
Merged at revision: 312
Proposed branch: lp:~kelemeng/indicator-sound/bug957517
Merge into: lp:indicator-sound/fifth
Diff against target: 63 lines (+5/-5)
4 files modified
src/indicator-sound.c (+2/-2)
src/metadata-widget.c (+1/-1)
src/voip-input-widget.c (+1/-1)
src/volume-widget.c (+1/-1)
To merge this branch: bzr merge lp:~kelemeng/indicator-sound/bug957517
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
Review via email: mp+98031@code.launchpad.net

This proposal supersedes a proposal from 2012-03-16.

To post a comment you must log in.
Revision history for this message
Charles Kerr (charlesk) wrote : Posted in a previous version of this proposal

Gabor, does adding the config.h change there have any effect? indicator-sound.h already includes config.h.

review: Needs Information
Revision history for this message
Charles Kerr (charlesk) wrote : Posted in a previous version of this proposal

Three other files going into libsoundmenu are also using gi18n.h instead of gi18n-lib.h:

metadata-widget.c
voip-input-widget.c
volume-widget.c

review: Needs Fixing
Revision history for this message
Gabor Kelemen (kelemeng) wrote : Posted in a previous version of this proposal

Oh, I didn't saw indicator-sound.h. It should be sufficient.
As for the other three files, I'll change those too, just for the case when some translatable content shows up in them in the future :).

Revision history for this message
Gabor Kelemen (kelemeng) wrote :

Wait, it does not compile. A new version is coming, sorry for the noise.

312. By Gabor Kelemen

Change i18n header to gi18n-lib.h to translate the accessible description. Also change it in other files too to make them futureproof. LP: #957517

Revision history for this message
Gabor Kelemen (kelemeng) wrote :

Now it complies, does not #include config.h twice, but looks a bit uglier :(.

Revision history for this message
Charles Kerr (charlesk) wrote : Posted in a previous version of this proposal

Looks good!

review: Approve
Revision history for this message
Charles Kerr (charlesk) wrote :

Hm, no you're right. It's more important to include the headers in the right order, than it is to duplicate config.h, I'll revert to your original version there before the merge.

Revision history for this message
Charles Kerr (charlesk) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/indicator-sound.c'
2--- src/indicator-sound.c 2012-03-16 11:07:29 +0000
3+++ src/indicator-sound.c 2012-03-17 00:40:24 +0000
4@@ -17,10 +17,11 @@
5 with this program. If not, see <http://www.gnu.org/licenses/>.
6 */
7
8+#include "indicator-sound.h"
9 #include <math.h>
10 #include <glib.h>
11 #include <glib-object.h>
12-#include <glib/gi18n.h>
13+#include <glib/gi18n-lib.h>
14 #include <gtk/gtk.h>
15 #include <gdk/gdkkeysyms.h>
16 #include <libdbusmenu-gtk/menu.h>
17@@ -28,7 +29,6 @@
18
19 #include <gio/gio.h>
20
21-#include "indicator-sound.h"
22 #include "transport-widget.h"
23 #include "metadata-widget.h"
24 #include "volume-widget.h"
25
26=== modified file 'src/metadata-widget.c'
27--- src/metadata-widget.c 2012-03-15 17:07:53 +0000
28+++ src/metadata-widget.c 2012-03-17 00:40:24 +0000
29@@ -22,7 +22,7 @@
30 #include "config.h"
31 #endif
32
33-#include <glib/gi18n.h>
34+#include <glib/gi18n-lib.h>
35 #include "metadata-widget.h"
36 #include "common-defs.h"
37 #include <gtk/gtk.h>
38
39=== modified file 'src/voip-input-widget.c'
40--- src/voip-input-widget.c 2011-03-23 11:26:54 +0000
41+++ src/voip-input-widget.c 2012-03-17 00:40:24 +0000
42@@ -22,7 +22,7 @@
43 #include "config.h"
44 #endif
45
46-#include <glib/gi18n.h>
47+#include <glib/gi18n-lib.h>
48 #include <math.h>
49 #include <glib.h>
50 #include "voip-input-widget.h"
51
52=== modified file 'src/volume-widget.c'
53--- src/volume-widget.c 2012-03-10 06:15:23 +0000
54+++ src/volume-widget.c 2012-03-17 00:40:24 +0000
55@@ -22,7 +22,7 @@
56 #include "config.h"
57 #endif
58
59-#include <glib/gi18n.h>
60+#include <glib/gi18n-lib.h>
61 #include <math.h>
62 #include <glib.h>
63 #include "volume-widget.h"

Subscribers

People subscribed via source and target branches