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
=== modified file 'src/indicator-sound.c'
--- src/indicator-sound.c 2012-03-16 11:07:29 +0000
+++ src/indicator-sound.c 2012-03-17 00:31:20 +0000
@@ -20,7 +20,7 @@
20#include <math.h>20#include <math.h>
21#include <glib.h>21#include <glib.h>
22#include <glib-object.h>22#include <glib-object.h>
23#include <glib/gi18n.h>23#include <glib/gi18n-lib.h>
24#include <gtk/gtk.h>24#include <gtk/gtk.h>
25#include <gdk/gdkkeysyms.h>25#include <gdk/gdkkeysyms.h>
26#include <libdbusmenu-gtk/menu.h>26#include <libdbusmenu-gtk/menu.h>
2727
=== modified file 'src/metadata-widget.c'
--- src/metadata-widget.c 2012-03-15 17:07:53 +0000
+++ src/metadata-widget.c 2012-03-17 00:31:20 +0000
@@ -22,7 +22,7 @@
22#include "config.h"22#include "config.h"
23#endif23#endif
2424
25#include <glib/gi18n.h>25#include <glib/gi18n-lib.h>
26#include "metadata-widget.h"26#include "metadata-widget.h"
27#include "common-defs.h"27#include "common-defs.h"
28#include <gtk/gtk.h>28#include <gtk/gtk.h>
2929
=== modified file 'src/voip-input-widget.c'
--- src/voip-input-widget.c 2011-03-23 11:26:54 +0000
+++ src/voip-input-widget.c 2012-03-17 00:31:20 +0000
@@ -22,7 +22,7 @@
22#include "config.h"22#include "config.h"
23#endif23#endif
2424
25#include <glib/gi18n.h>25#include <glib/gi18n-lib.h>
26#include <math.h>26#include <math.h>
27#include <glib.h>27#include <glib.h>
28#include "voip-input-widget.h"28#include "voip-input-widget.h"
2929
=== modified file 'src/volume-widget.c'
--- src/volume-widget.c 2012-03-10 06:15:23 +0000
+++ src/volume-widget.c 2012-03-17 00:31:20 +0000
@@ -22,7 +22,7 @@
22#include "config.h"22#include "config.h"
23#endif23#endif
2424
25#include <glib/gi18n.h>25#include <glib/gi18n-lib.h>
26#include <math.h>26#include <math.h>
27#include <glib.h>27#include <glib.h>
28#include "volume-widget.h"28#include "volume-widget.h"

Subscribers

People subscribed via source and target branches