r41558 - in /desktop/unstable/gnome-control-center/debian: changelog patches/0001-online-accounts-handle-unbranded-chat-providers.patch patches/series

[pochu at users.alioth.debian.org]

Author: pochu
Date: Sun Apr 27 13:23:39 2014
New Revision: 41558

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=41558
Log:
* 0001-online-accounts-handle-unbranded-chat-providers.patch:
  + Backport patch from upstream git to handle unbranded providers,
    fixes a segfault when trying to add an account.

Added:
    desktop/unstable/gnome-control-center/debian/patches/0001-online-accounts-handle-unbranded-chat-providers.patch
Modified:
    desktop/unstable/gnome-control-center/debian/changelog
    desktop/unstable/gnome-control-center/debian/patches/series

Modified: desktop/unstable/gnome-control-center/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-control-center/debian/changelog?rev=41558&op=diff
==============================================================================
--- desktop/unstable/gnome-control-center/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-control-center/debian/changelog	[utf-8] Sun Apr 27 13:23:39 2014
@@ -1,3 +1,11 @@
+gnome-control-center (1:3.8.3-7) UNRELEASED; urgency=medium
+
+  * 0001-online-accounts-handle-unbranded-chat-providers.patch:
+    + Backport patch from upstream git to handle unbranded providers,
+      fixes a segfault when trying to add an account.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Sun, 27 Apr 2014 15:08:27 +0200
+
 gnome-control-center (1:3.8.3-6) unstable; urgency=medium
 
   * d/p/0001-online-accounts-Accept-requests-for-account-creation.patch,

Added: desktop/unstable/gnome-control-center/debian/patches/0001-online-accounts-handle-unbranded-chat-providers.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-control-center/debian/patches/0001-online-accounts-handle-unbranded-chat-providers.patch?rev=41558&op=file
==============================================================================
--- desktop/unstable/gnome-control-center/debian/patches/0001-online-accounts-handle-unbranded-chat-providers.patch	(added)
+++ desktop/unstable/gnome-control-center/debian/patches/0001-online-accounts-handle-unbranded-chat-providers.patch	[utf-8] Sun Apr 27 13:23:39 2014
@@ -0,0 +1,52 @@
+From 570611752e1bf1a0cf01f2581ec03525381066bd Mon Sep 17 00:00:00 2001
+From: Marco Barisione <marco.barisione at collabora.co.uk>
+Date: Thu, 25 Jul 2013 13:08:58 +0100
+Subject: [PATCH] online-accounts: handle unbranded chat providers
+
+https://bugzilla.gnome.org/show_bug.cgi?id=706148
+---
+ .../online-accounts/cc-online-accounts-add-account-dialog.c  | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+--- a/panels/online-accounts/cc-online-accounts-add-account-dialog.c
++++ b/panels/online-accounts/cc-online-accounts-add-account-dialog.c
+@@ -41,6 +41,7 @@
+   EggListBox *branded_list_box;
+   EggListBox *contacts_list_box;
+   EggListBox *mail_list_box;
++  EggListBox *chat_list_box;
+   EggListBox *ticketing_list_box;
+   GError *error;
+   GoaClient *client;
+@@ -49,6 +50,7 @@
+   GtkListStore *list_store;
+   GtkWidget *contacts_grid;
+   GtkWidget *mail_grid;
++  GtkWidget *chat_grid;
+   GtkWidget *ticketing_grid;
+   GtkWidget *stack;
+   gboolean add_other;
+@@ -339,6 +341,12 @@
+                                       _("Contacts"));
+ 
+   add_account_dialog_create_group_ui (add_account,
++                                      &priv->chat_list_box,
++                                      &priv->chat_grid,
++                                      grid,
++                                      _("Chat"));
++
++  add_account_dialog_create_group_ui (add_account,
+                                       &priv->ticketing_list_box,
+                                       &priv->ticketing_grid,
+                                       grid,
+@@ -433,6 +441,10 @@
+       group_grid = priv->mail_grid;
+       list_box = priv->mail_list_box;
+       break;
++    case GOA_PROVIDER_GROUP_CHAT:
++      group_grid = priv->chat_grid;
++      list_box = priv->chat_list_box;
++      break;
+     case GOA_PROVIDER_GROUP_TICKETING:
+       group_grid = priv->ticketing_grid;
+       list_box = priv->ticketing_list_box;

Modified: desktop/unstable/gnome-control-center/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-control-center/debian/patches/series?rev=41558&op=diff
==============================================================================
--- desktop/unstable/gnome-control-center/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-control-center/debian/patches/series	[utf-8] Sun Apr 27 13:23:39 2014
@@ -3,3 +3,4 @@
 07-vpn-plugin-properties-paths.patch
 0001-online-accounts-Accept-requests-for-account-creation.patch
 0001-online-accounts-use-the-async-function-to-get-all-th.patch
+0001-online-accounts-handle-unbranded-chat-providers.patch