Ubuntu One Client

Merge lp:~rodrigo-moya/ubuntuone-client/fix-640955 into lp:ubuntuone-client

  1. fix-640955
  2. Merge into trunk
Proposed by Rodrigo Moya
Status: Merged
Approved by: Rodrigo Moya
Approved revision: 710
Merged at revision: 711
Proposed branch: lp:~rodrigo-moya/ubuntuone-client/fix-640955
Merge into: lp:ubuntuone-client
Diff against target: 85 lines (+25/-6)
5 files modified
nautilus/add-contact-dialog.c (+5/-1)
nautilus/contacts-view.c (+5/-2)
nautilus/location-widget.c (+5/-1)
nautilus/share-dialog.c (+5/-1)
nautilus/u1-contacts-picker.c (+5/-1)
To merge this branch: bzr merge lp:~rodrigo-moya/ubuntuone-client/fix-640955
Reviewer Review Type Date Requested Status
Manuel de la Peña (community) Approve
Rick McBride (community) Approve
Review via email: mp+35807@code.launchpad.net

Commit message

Include glib's gi18n-lib.h, which forces definition of GETTEXT_PACKAGE

Description of the change

Include glib's gi18n-lib.h, which forces definition of GETTEXT_PACKAGE

To post a comment you must log in.
Revision history for this message
Rick McBride (rmcbride) wrote :

I get an error in make test with this branch (did not with the previous one)

===============================================================================
[ERROR]: tests.syncdaemon.test_eq_inotify.FreezeTests.test_rollback

Traceback (most recent call last):
Failure: twisted.internet.defer.TimeoutError: <tests.syncdaemon.test_eq_inotify.FreezeTests testMethod=test_rollback> (test_rollback) still running at 2.0 secs
-------------------------------------------------------------------------------

On a side note, we now have 1337 tests.

Which is aweseome.

review: Needs Fixing
Revision history for this message
Rick McBride (rmcbride) wrote :

retrying

review: Needs Information
Revision history for this message
Rick McBride (rmcbride) wrote :

does not recur. Approve

review: Approve
Revision history for this message
Manuel de la Peña (mandel) wrote :

+1 works on mine too.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'nautilus/add-contact-dialog.c'
2--- nautilus/add-contact-dialog.c 2010-06-02 14:44:08 +0000
3+++ nautilus/add-contact-dialog.c 2010-09-17 12:08:43 +0000
4@@ -20,7 +20,11 @@
5 */
6
7 #include <string.h>
8-#include <glib/gi18n.h>
9+#ifdef HAVE_CONFIG_H
10+#include <config.h>
11+#endif
12+
13+#include <glib/gi18n-lib.h>
14 #include "add-contact-dialog.h"
15
16 G_DEFINE_TYPE(AddContactDialog, add_contact_dialog, GTK_TYPE_DIALOG)
17
18=== modified file 'nautilus/contacts-view.c'
19--- nautilus/contacts-view.c 2010-09-16 17:08:02 +0000
20+++ nautilus/contacts-view.c 2010-09-17 12:08:43 +0000
21@@ -19,8 +19,11 @@
22 * Boston, MA 02110-1301, USA.
23 */
24
25-#include "config.h"
26-#include <glib/gi18n.h>
27+#ifdef HAVE_CONFIG_H
28+#include <config.h>
29+#endif
30+
31+#include <glib/gi18n-lib.h>
32 #include "contacts-view.h"
33 #include "highlight.h"
34
35
36=== modified file 'nautilus/location-widget.c'
37--- nautilus/location-widget.c 2010-09-07 09:19:15 +0000
38+++ nautilus/location-widget.c 2010-09-17 12:08:43 +0000
39@@ -19,7 +19,11 @@
40 *
41 */
42
43-#include <glib/gi18n.h>
44+#ifdef HAVE_CONFIG_H
45+#include <config.h>
46+#endif
47+
48+#include <glib/gi18n-lib.h>
49 #include <libsyncdaemon/syncdaemon-folders-interface.h>
50 #include <libsyncdaemon/syncdaemon-shares-interface.h>
51 #include "location-widget.h"
52
53=== modified file 'nautilus/share-dialog.c'
54--- nautilus/share-dialog.c 2010-08-02 10:40:26 +0000
55+++ nautilus/share-dialog.c 2010-09-17 12:08:43 +0000
56@@ -19,7 +19,11 @@
57 *
58 */
59
60-#include <glib/gi18n.h>
61+#ifdef HAVE_CONFIG_H
62+#include <config.h>
63+#endif
64+
65+#include <glib/gi18n-lib.h>
66 #include <libsyncdaemon/libsyncdaemon.h>
67 #include "share-dialog.h"
68 #include "u1-contacts-picker.h"
69
70=== modified file 'nautilus/u1-contacts-picker.c'
71--- nautilus/u1-contacts-picker.c 2010-07-08 17:17:59 +0000
72+++ nautilus/u1-contacts-picker.c 2010-09-17 12:08:43 +0000
73@@ -19,7 +19,11 @@
74 * Boston, MA 02110-1301, USA.
75 */
76
77-#include <glib/gi18n.h>
78+#ifdef HAVE_CONFIG_H
79+#include <config.h>
80+#endif
81+
82+#include <glib/gi18n-lib.h>
83 #include "u1-contacts-picker.h"
84 #include "add-contact-dialog.h"
85 #include "contacts-view.h"

Subscribers

People subscribed via source and target branches