Merge lp:~bcurtiswx/ubuntu/natty/empathy/empathy-2.32.2-0ubuntu7 into lp:~ubuntu-desktop/empathy/ubuntu

[Brian Curtis]

empathy (2.32.2-0ubuntu7) natty; urgency=low

  * debian/patches/00_git_conn_disc_notif.patch (LP: #582757)
  * debian/patches/00_git_F2_opens_contact_info.patch (LP: #387991)
  * debian/patches/00_git_tooltip_on_error_info.patch (LP: #681413)
  * debian/rules
    - added --with-ca-file='/etc/ssl/certs/ca-certificates.crt'

 -- Brian Curtis <email address hidden> Tue, 25 Jan 2011 13:20:01 -0500

[lp:~bcurtiswx/ubuntu/natty/empathy/empathy-2.32.2-0ubuntu7]

163. By Brian Curtis on 2011-01-26

* debian/rules
  - added --with-ca-file='/etc/ssl/certs/ca-certificates.crt'

=== modified file 'debian/changelog'
--- debian/changelog	2011-01-17 15:18:36 +0000
+++ debian/changelog	2011-01-26 17:12:31 +0000
@@ -1,3 +1,13 @@
+empathy (2.32.2-0ubuntu7) natty; urgency=low
+
+  * debian/patches/00_git_conn_disc_notif.patch (LP: #582757)
+  * debian/patches/00_git_F2_opens_contact_info.patch (LP: #387991)
+  * debian/patches/00_git_tooltip_on_error_info.patch (LP: #681413)
+  * debian/rules
+    - added --with-ca-file='/etc/ssl/certs/ca-certificates.crt'
+
+ -- Brian Curtis <[e-mail]>  Tue, 25 Jan 2011 13:20:01 -0500
+
 empathy (2.32.2-0ubuntu6) natty; urgency=low
 
   * debian/patches/22_tell_if_the_message_is_a_pending_one_or_not.patch:

=== added file 'debian/patches/00_git_F2_opens_contact_info.patch'
--- debian/patches/00_git_F2_opens_contact_info.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/00_git_F2_opens_contact_info.patch	2011-01-26 17:12:31 +0000
@@ -0,0 +1,54 @@
+From c4a806bea01fcb3862ab43e88eede77fca1ce7e0 Mon Sep 17 00:00:00 2001
+From: Kushal Das <[e-mail]>
+Date: Tue, 11 Jan 2011 12:19:18 +0000
+Subject: Pressing F2 opens the Edit Contact Information window for #586257
+
+---
+Index: empathy-2.32.2/libempathy-gtk/empathy-individual-view.c
+===================================================================
+--- empathy-2.32.2.orig/libempathy-gtk/empathy-individual-view.c	2010-11-18 09:25:30.000000000 -0500
++++ empathy-2.32.2/libempathy-gtk/empathy-individual-view.c	2011-01-25 13:27:17.253997002 -0500
+@@ -47,6 +47,7 @@
+ #include "empathy-individual-view.h"
+ #include "empathy-individual-menu.h"
+ #include "empathy-individual-store.h"
++#include "empathy-contact-dialogs.h"
+ #include "empathy-images.h"
+ #include "empathy-linking-dialog.h"
+ #include "empathy-cell-renderer-expander.h"
+@@ -891,6 +892,25 @@
+       data->button = 0;
+       data->time = event->time;
+       g_idle_add (individual_view_popup_menu_idle_cb, data);
++    } else if (event->keyval == GDK_KEY_F2) {
++        FolksIndividual *individual;
++        EmpathyContact *contact;
++
++        g_return_val_if_fail (EMPATHY_IS_INDIVIDUAL_VIEW (view), FALSE);
++
++        individual = empathy_individual_view_dup_selected (view);
++        if (individual == NULL)
++            return FALSE;
++
++        contact = empathy_contact_dup_from_folks_individual (individual);
++        if (contact == NULL) {
++            g_object_unref (individual);
++            return FALSE;
++        }
++        empathy_contact_edit_dialog_show (contact, NULL);
++
++        g_object_unref (individual);
++        g_object_unref (contact);
+     }
+ 
+   return FALSE;
+@@ -1314,7 +1334,8 @@
+   GdkEventKey *eventkey = ((GdkEventKey *) event);
+   gboolean ret = FALSE;
+ 
+-  if (eventkey->keyval == GDK_Up || eventkey->keyval == GDK_Down)
++  if (eventkey->keyval == GDK_KEY_Up || eventkey->keyval == GDK_KEY_Down
++      || eventkey->keyval == GDK_KEY_F2)
+     {
+       GdkEvent *new_event;
+ 

=== added file 'debian/patches/00_git_conn_disc_notif.patch'
--- debian/patches/00_git_conn_disc_notif.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/00_git_conn_disc_notif.patch	2011-01-26 17:12:31 +0000
@@ -0,0 +1,42 @@
+From 59a145f0076fd39b5ff624e936dbe3d4dbc49d5b Mon Sep 17 00:00:00 2001
+From: Guillaume Desmottes <[e-mail]>
+Date: Fri, 14 Jan 2011 08:53:04 +0000
+Subject: Improve connected/disconnected notifications (#639352)
+
+---
+Index: empathy-2.32.2/src/empathy-event-manager.c
+===================================================================
+--- empathy-2.32.2.orig/src/empathy-event-manager.c	2010-11-18 09:25:31.000000000 -0500
++++ empathy-2.32.2/src/empathy-event-manager.c	2011-01-25 13:18:55.713997002 -0500
+@@ -1049,11 +1049,12 @@
+           if (g_settings_get_boolean (gsettings,
+                 EMPATHY_PREFS_NOTIFICATIONS_CONTACT_SIGNOUT))
+             {
+-              header = g_strdup_printf (_("%s is now offline."),
++              header = g_strdup_printf ("<b>%s</b>",
+                   empathy_contact_get_alias (contact));
+ 
+-              event_manager_add (manager, contact, EMPATHY_EVENT_TYPE_PRESENCE,
+-                  EMPATHY_IMAGE_AVATAR_DEFAULT, header, NULL, NULL, NULL, NULL);
++              event_manager_add (manager, contact,
++                  EMPATHY_EVENT_TYPE_PRESENCE, EMPATHY_IMAGE_AVATAR_DEFAULT,
++                  header, _("Disconnected"), NULL, NULL, NULL);
+             }
+         }
+     }
+@@ -1069,11 +1070,12 @@
+           if (g_settings_get_boolean (gsettings,
+                 EMPATHY_PREFS_NOTIFICATIONS_CONTACT_SIGNIN))
+             {
+-              header = g_strdup_printf (_("%s is now online."),
++              header = g_strdup_printf ("<b>%s</b>",
+                   empathy_contact_get_alias (contact));
+ 
+-              event_manager_add (manager, contact, EMPATHY_EVENT_TYPE_PRESENCE,
+-                  EMPATHY_IMAGE_AVATAR_DEFAULT, header, NULL, NULL, NULL, NULL);
++              event_manager_add (manager, contact,
++                  EMPATHY_EVENT_TYPE_PRESENCE, EMPATHY_IMAGE_AVATAR_DEFAULT,
++                  header, _("Connected"), NULL, NULL, NULL);
+             }
+         }
+     }

=== added file 'debian/patches/00_git_tooltip_on_error_info.patch'
--- debian/patches/00_git_tooltip_on_error_info.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/00_git_tooltip_on_error_info.patch	2011-01-26 17:12:31 +0000
@@ -0,0 +1,18 @@
+From b4930806a93a8b365400e563b8fa359c00c4016a Mon Sep 17 00:00:00 2001
+From: Robert Sajdok <[e-mail]>
+Date: Mon, 13 Dec 2010 09:40:23 +0000
+Subject: main-window: add a tooltip on connection error info bars (#626507)
+
+---
+Index: empathy-2.32.2/src/empathy-main-window.c
+===================================================================
+--- empathy-2.32.2.orig/src/empathy-main-window.c	2010-11-18 09:25:31.000000000 -0500
++++ empathy-2.32.2/src/empathy-main-window.c	2011-01-25 13:42:34.073996998 -0500
+@@ -591,6 +591,7 @@
+ 			  G_CALLBACK (main_window_error_retry_clicked_cb),
+ 			  window);
+ 
++	gtk_widget_set_tooltip_text (priv->errors_vbox, error_message);
+ 	gtk_widget_show (priv->errors_vbox);
+ 
+ 	g_hash_table_insert (priv->errors, g_object_ref (account), info_bar);

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-01-17 15:18:36 +0000
+++ debian/patches/series	2011-01-26 17:12:31 +0000
@@ -1,3 +1,6 @@
+00_git_tooltip_on_error_info.patch
+00_git_F2_opens_contact_info.patch
+00_git_conn_disc_notif.patch
 enable_pidgin_imported_contacts.patch
 reword_subscription_dailog_to_be_less_technical.patch
 00git_folks_aliasable_groupable.patch

=== modified file 'debian/rules'
--- debian/rules	2010-11-24 06:32:18 +0000
+++ debian/rules	2011-01-26 17:12:31 +0000
@@ -21,7 +21,8 @@
                              --enable-webkit \
                              --enable-map=no \
                              --enable-favourite-contacts=no \
-                             --enable-nautilus-sendto
+                             --enable-nautilus-sendto \
+                             --with-ca-file='/etc/ssl/certs/ca-certificates.crt'
 
 DEB_DBG_PACKAGE_empathy = empathy-dbg