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

[Rodrigo Moya]

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

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

[Rick McBride (rmcbride)]

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

[Rick McBride (rmcbride)]

retrying

review: Needs Information

[Rick McBride (rmcbride)]

does not recur. Approve

review: Approve

[Manuel de la Peña (mandel)]

+1 works on mine too.

review: Approve

=== modified file 'nautilus/add-contact-dialog.c'
--- nautilus/add-contact-dialog.c	2010-06-02 14:44:08 +0000
+++ nautilus/add-contact-dialog.c	2010-09-17 12:08:43 +0000
@@ -20,7 +20,11 @@
  */
 
 #include <string.h>
-#include <glib/gi18n.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib/gi18n-lib.h>
 #include "add-contact-dialog.h"
 
 G_DEFINE_TYPE(AddContactDialog, add_contact_dialog, GTK_TYPE_DIALOG)
 
=== modified file 'nautilus/contacts-view.c'
--- nautilus/contacts-view.c	2010-09-16 17:08:02 +0000
+++ nautilus/contacts-view.c	2010-09-17 12:08:43 +0000
@@ -19,8 +19,11 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "config.h"
-#include <glib/gi18n.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib/gi18n-lib.h>
 #include "contacts-view.h"
 #include "highlight.h"
 
 
=== modified file 'nautilus/location-widget.c'
--- nautilus/location-widget.c	2010-09-07 09:19:15 +0000
+++ nautilus/location-widget.c	2010-09-17 12:08:43 +0000
@@ -19,7 +19,11 @@
  *
  */
 
-#include <glib/gi18n.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib/gi18n-lib.h>
 #include <libsyncdaemon/syncdaemon-folders-interface.h>
 #include <libsyncdaemon/syncdaemon-shares-interface.h>
 #include "location-widget.h"
 
=== modified file 'nautilus/share-dialog.c'
--- nautilus/share-dialog.c	2010-08-02 10:40:26 +0000
+++ nautilus/share-dialog.c	2010-09-17 12:08:43 +0000
@@ -19,7 +19,11 @@
  *
  */
 
-#include <glib/gi18n.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib/gi18n-lib.h>
 #include <libsyncdaemon/libsyncdaemon.h>
 #include "share-dialog.h"
 #include "u1-contacts-picker.h"
 
=== modified file 'nautilus/u1-contacts-picker.c'
--- nautilus/u1-contacts-picker.c	2010-07-08 17:17:59 +0000
+++ nautilus/u1-contacts-picker.c	2010-09-17 12:08:43 +0000
@@ -19,7 +19,11 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <glib/gi18n.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib/gi18n-lib.h>
 #include "u1-contacts-picker.h"
 #include "add-contact-dialog.h"
 #include "contacts-view.h"