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

Proposed by Gabor Kelemen on 2012-03-16
Status: Superseded
Proposed branch: lp:~kelemeng/indicator-sound/bug957517
Merge into: lp:indicator-sound/fifth
Diff against target: 51 lines (+4/-4)
4 files modified
src/indicator-sound.c (+1/-1)
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) 2012-03-16 Approve on 2012-03-17
Review via email: mp+98017@code.launchpad.net

This proposal has been superseded by a proposal from 2012-03-17.

To post a comment you must log in.
Charles Kerr (charlesk) wrote :

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

review: Needs Information
Charles Kerr (charlesk) wrote :

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
Gabor Kelemen (kelemeng) wrote :

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

312. By Gabor Kelemen on 2012-03-17

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

Charles Kerr (charlesk) wrote :

Looks good!

review: Approve

Unmerged revisions

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:31:20 +0000
4@@ -20,7 +20,7 @@
5 #include <math.h>
6 #include <glib.h>
7 #include <glib-object.h>
8-#include <glib/gi18n.h>
9+#include <glib/gi18n-lib.h>
10 #include <gtk/gtk.h>
11 #include <gdk/gdkkeysyms.h>
12 #include <libdbusmenu-gtk/menu.h>
13
14=== modified file 'src/metadata-widget.c'
15--- src/metadata-widget.c 2012-03-15 17:07:53 +0000
16+++ src/metadata-widget.c 2012-03-17 00:31:20 +0000
17@@ -22,7 +22,7 @@
18 #include "config.h"
19 #endif
20
21-#include <glib/gi18n.h>
22+#include <glib/gi18n-lib.h>
23 #include "metadata-widget.h"
24 #include "common-defs.h"
25 #include <gtk/gtk.h>
26
27=== modified file 'src/voip-input-widget.c'
28--- src/voip-input-widget.c 2011-03-23 11:26:54 +0000
29+++ src/voip-input-widget.c 2012-03-17 00:31:20 +0000
30@@ -22,7 +22,7 @@
31 #include "config.h"
32 #endif
33
34-#include <glib/gi18n.h>
35+#include <glib/gi18n-lib.h>
36 #include <math.h>
37 #include <glib.h>
38 #include "voip-input-widget.h"
39
40=== modified file 'src/volume-widget.c'
41--- src/volume-widget.c 2012-03-10 06:15:23 +0000
42+++ src/volume-widget.c 2012-03-17 00:31:20 +0000
43@@ -22,7 +22,7 @@
44 #include "config.h"
45 #endif
46
47-#include <glib/gi18n.h>
48+#include <glib/gi18n-lib.h>
49 #include <math.h>
50 #include <glib.h>
51 #include "volume-widget.h"

Subscribers

People subscribed via source and target branches