Merge lp:~om26er/ubuntu/natty/empathy/empathy-bug-fixes into lp:~ubuntu-desktop/empathy/ubuntu

[Omer Akram]

backported two empathy bug fixes since we are not sure at this point if we'd be having empathy 3.0 in Natty

=== modified file 'debian/changelog'
--- debian/changelog	2010-12-06 05:15:25 +0000
+++ debian/changelog	2011-01-05 14:37:37 +0000
@@ -1,3 +1,12 @@
+empathy (2.32.2-0ubuntu3) natty; urgency=low
+
+  * debian/patches/enable_pidgin_imported_contacts.patch:
+    - Enable pidgin imported accounts by default. (LP: #622215)
+  * debian/patches/reword_subscription_dailog_to_be_less_technical.patch:
+    - Reword subscription request dialog to be less technical. (LP: #670197)
+
+ -- Omer Akram <[e-mail]>  Wed, 05 Jan 2011 19:23:37 +0500
+
 empathy (2.32.2-0ubuntu2) natty; urgency=low
 
   * debian/patches/00git_folks_aliasable_groupable.patch:

=== added file 'debian/patches/enable_pidgin_imported_contacts.patch'
--- debian/patches/enable_pidgin_imported_contacts.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/enable_pidgin_imported_contacts.patch	2011-01-05 14:37:37 +0000
@@ -0,0 +1,158 @@
+From: Vitaly Minko <[e-mail]>
+Subject: Enable imported Pidgin accounts if needed.
+Origin: http://git.gnome.org/browse/empathy/commit/?id=888df7fc53595e18c5de077860881bd10f327cc5
+Bug: https://bugs.gnome.org/594145
+Bug-Ubuntu: https://launchpad.net/bugs/622215
+
+---
+diff --git a/src/empathy-import-pidgin.c b/src/empathy-import-pidgin.c
+index ab69d41..4de9bce 100644
+--- a/src/empathy-import-pidgin.c
++++ b/src/empathy-import-pidgin.c
+@@ -93,6 +93,8 @@ static PidginCmMapItem pidgin_cm_map[] =
+ #define PIDGIN_ACCOUNT_TAG_PROTOCOL "protocol"
+ #define PIDGIN_ACCOUNT_TAG_PASSWORD "password"
+ #define PIDGIN_ACCOUNT_TAG_SETTINGS "settings"
++#define PIDGIN_SETTING_PROP_UI "ui"
++#define PIDGIN_SETTING_PROP_NAME "name"
+ #define PIDGIN_SETTING_PROP_TYPE "type"
+ #define PIDGIN_PROTOCOL_BONJOUR "bonjour"
+ #define PIDGIN_PROTOCOL_NOVELL "novell"
+@@ -110,7 +112,7 @@ import_dialog_pidgin_parse_setting (EmpathyImportAccountData *data,
+ 
+   /* We can't do anything if the setting don't have a name */
+   tag_name = (gchar *) xmlGetProp (setting,
+-      (xmlChar *) PIDGIN_ACCOUNT_TAG_NAME);
++      (xmlChar *) PIDGIN_SETTING_PROP_NAME);
+   if (!tag_name)
+     return;
+ 
+@@ -183,10 +185,54 @@ import_dialog_pidgin_parse_setting (EmpathyImportAccountData *data,
+   g_free (content);
+ }
+ 
++static void
++import_dialog_pidgin_handle_settings (EmpathyImportAccountData *data,
++                                      xmlNodePtr settings)
++{
++  xmlNodePtr setting;
++  gchar *tag_ui, *name, *type, *content;
++
++  tag_ui = (gchar *) xmlGetProp (settings, (xmlChar *) PIDGIN_SETTING_PROP_UI);
++
++  /* UI settings - fetch the Enabled parameter.
++   * The expected value of the ui property is 'gtk-gaim', which looks obsolete,
++   * but still valid for 2.7.3.
++   */
++  if (tag_ui && !tp_strdiff (tag_ui, "gtk-gaim"))
++    {
++      for (setting = settings->children; setting; setting = setting->next)
++        {
++          name = (gchar *) xmlGetProp (setting,
++              (xmlChar *) PIDGIN_SETTING_PROP_NAME);
++          type = (gchar *) xmlGetProp (setting,
++              (xmlChar *) PIDGIN_SETTING_PROP_TYPE);
++          /* The Enabled parameter is supposed to be boolean.
++           * Pidgin name of the setting is 'auto-login'.
++           */
++          if (!tp_strdiff (name, "auto-login") && !tp_strdiff (type, "bool"))
++            {
++              content = (gchar *) xmlNodeGetContent (setting);
++              data->enabled = (0 != (gint) g_ascii_strtod (content, NULL));
++              g_free (content);
++            }
++          g_free (type);
++          g_free (name);
++        }
++    }
++  /* General settings. */
++  else
++    {
++      for (setting = settings->children; setting; setting = setting->next)
++        import_dialog_pidgin_parse_setting (data, setting);
++    }
++
++  g_free (tag_ui);
++}
++
+ GList *
+ empathy_import_pidgin_load (void)
+ {
+-  xmlNodePtr rootnode, node, child, setting;
++  xmlNodePtr rootnode, node, child;
+   xmlParserCtxtPtr ctxt;
+   xmlDocPtr doc;
+   gchar *filename;
+@@ -310,8 +356,7 @@ empathy_import_pidgin_load (void)
+           /* Other settings */
+           else if (!tp_strdiff ((gchar *) child->name,
+               PIDGIN_ACCOUNT_TAG_SETTINGS))
+-              for (setting = child->children; setting; setting = setting->next)
+-                import_dialog_pidgin_parse_setting (data, setting);
++            import_dialog_pidgin_handle_settings (data, child);
+         }
+ 
+       /* If we have the needed settings, add the account data to the list,
+diff --git a/src/empathy-import-utils.c b/src/empathy-import-utils.c
+index 520f056..7e69d62 100644
+--- a/src/empathy-import-utils.c
++++ b/src/empathy-import-utils.c
+@@ -40,6 +40,7 @@ empathy_import_account_data_new (const gchar *source)
+   data->source = g_strdup (source);
+   data->protocol = NULL;
+   data->connection_manager = NULL;
++  data->enabled = FALSE;
+ 
+   return data;
+ }
+diff --git a/src/empathy-import-utils.h b/src/empathy-import-utils.h
+index 20af25a..09b85e0 100644
+--- a/src/empathy-import-utils.h
++++ b/src/empathy-import-utils.h
+@@ -37,6 +37,8 @@ typedef struct
+   gchar *connection_manager;
+   /* The name of the account import source */
+   gchar *source;
++  /* Indicates whether the account is enabled by default */
++  gboolean enabled;
+ } EmpathyImportAccountData;
+ 
+ typedef enum {
+diff --git a/src/empathy-import-widget.c b/src/empathy-import-widget.c
+index 0989818..fc1e2f5 100644
+--- a/src/empathy-import-widget.c
++++ b/src/empathy-import-widget.c
+@@ -167,6 +167,7 @@ import_widget_create_account_cb (GObject *source,
+   GAsyncResult *result,
+   gpointer user_data)
+ {
++  TpAccountManager *account_manager;
+   TpAccount *account;
+   GError *error = NULL;
+   EmpathyImportWidget *self = user_data;
+@@ -184,6 +185,13 @@ import_widget_create_account_cb (GObject *source,
+ 
+   DEBUG ("account created\n");
+ 
++  if (tp_account_is_enabled (account))
++    {
++      account_manager = tp_account_manager_dup ();
++      empathy_connect_new_account (account, account_manager);
++      g_object_unref (account_manager);
++    }
++
+   g_object_unref (self);
+ }
+ 
+@@ -208,7 +216,8 @@ import_widget_add_account (EmpathyImportWidget *self,
+ 
+   DEBUG ("display name: %s\n", display_name);
+ 
+-  properties = g_hash_table_new (NULL, NULL);
++  properties = tp_asv_new (NULL, NULL);
++  tp_asv_set_boolean (properties, TP_IFACE_ACCOUNT ".Enabled", data->enabled);
+ 
+   tp_account_manager_create_account_async (account_manager,
+       (const gchar*) data->connection_manager, data->protocol, display_name,
+--
+cgit v0.8.3.1

=== added file 'debian/patches/reword_subscription_dailog_to_be_less_technical.patch'
--- debian/patches/reword_subscription_dailog_to_be_less_technical.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/reword_subscription_dailog_to_be_less_technical.patch	2011-01-05 14:37:37 +0000
@@ -0,0 +1,24 @@
+From: Alex Launi <[e-mail]>
+Subject: Reword subscription request dialog to be less technical.
+Origin: http://git.gnome.org/browse/empathy/commit/?id=20bf62e79da14568fcd8c65fd561d601acf4b882
+Bug: https://bugs.gnome.org/633870
+Bug-Ubuntu: https://launchpad.net/bugs/670197
+
+---
+diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
+index 0216eea..439bb3a 100644
+--- a/src/empathy-event-manager.c
++++ b/src/empathy-event-manager.c
+@@ -1002,8 +1002,8 @@ event_manager_pendings_changed_cb (EmpathyContactList  *list,
+       return;
+     }
+ 
+-  header = g_strdup_printf (_("Subscription requested by %s"),
+-    empathy_contact_get_alias (contact));
++  header = g_strdup_printf (_("%s would like permission to see when you are available"),
++    empathy_contact_get_alias (contact);
+ 
+   if (!EMP_STR_EMPTY (message))
+     event_msg = g_strdup_printf (_("\nMessage: %s"), message);
+--
+cgit v0.8.3.1

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-12-06 05:15:25 +0000
+++ debian/patches/series	2011-01-05 14:37:37 +0000
@@ -1,3 +1,5 @@
+enable_pidgin_imported_contacts.patch
+reword_subscription_dailog_to_be_less_technical.patch
 00git_folks_aliasable_groupable.patch
 00git_individual_methods.patch
 01_lpi.patch