Ubuntu
empathy package

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

  1. Natty (11.04)
  2. empathy-2.32.2-0ubuntu7
  3. Merge into ubuntu
Proposed by Brian Curtis
Status: Merged
Merged at revision: 162
Proposed branch: lp:~bcurtiswx/ubuntu/natty/empathy/empathy-2.32.2-0ubuntu7
Merge into: lp:~ubuntu-desktop/empathy/ubuntu
Diff against target: 170 lines (+129/-1)
6 files modified
debian/changelog (+10/-0)
debian/patches/00_git_F2_opens_contact_info.patch (+54/-0)
debian/patches/00_git_conn_disc_notif.patch (+42/-0)
debian/patches/00_git_tooltip_on_error_info.patch (+18/-0)
debian/patches/series (+3/-0)
debian/rules (+2/-1)
To merge this branch: bzr merge lp:~bcurtiswx/ubuntu/natty/empathy/empathy-2.32.2-0ubuntu7
Reviewer Review Type Date Requested Status
Ubuntu Desktop Pending
Review via email: mp+47557@code.launchpad.net

Description of the change

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

To post a comment you must log in.
lp:~bcurtiswx/ubuntu/natty/empathy/empathy-2.32.2-0ubuntu7 updated
163. By Brian Curtis

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1empathy (2.32.2-0ubuntu7) natty; urgency=low
2
3 * debian/patches/00_git_conn_disc_notif.patch (LP: #582757)
4 * debian/patches/00_git_F2_opens_contact_info.patch (LP: #387991)
5 * debian/patches/00_git_tooltip_on_error_info.patch (LP: #681413)
6 * debian/rules
7 - added --with-ca-file='/etc/ssl/certs/ca-certificates.crt'
8
9 -- Brian Curtis <bcurtiswx@ubuntu.com> Tue, 25 Jan 2011 13:20:01 -0500
10
1empathy (2.32.2-0ubuntu6) natty; urgency=low11empathy (2.32.2-0ubuntu6) natty; urgency=low
212
3 * debian/patches/22_tell_if_the_message_is_a_pending_one_or_not.patch:13 * debian/patches/22_tell_if_the_message_is_a_pending_one_or_not.patch:
414
=== 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 @@
1From c4a806bea01fcb3862ab43e88eede77fca1ce7e0 Mon Sep 17 00:00:00 2001
2From: Kushal Das <kushal@fedoraproject.org>
3Date: Tue, 11 Jan 2011 12:19:18 +0000
4Subject: Pressing F2 opens the Edit Contact Information window for #586257
5
6---
7Index: empathy-2.32.2/libempathy-gtk/empathy-individual-view.c
8===================================================================
9--- empathy-2.32.2.orig/libempathy-gtk/empathy-individual-view.c 2010-11-18 09:25:30.000000000 -0500
10+++ empathy-2.32.2/libempathy-gtk/empathy-individual-view.c 2011-01-25 13:27:17.253997002 -0500
11@@ -47,6 +47,7 @@
12 #include "empathy-individual-view.h"
13 #include "empathy-individual-menu.h"
14 #include "empathy-individual-store.h"
15+#include "empathy-contact-dialogs.h"
16 #include "empathy-images.h"
17 #include "empathy-linking-dialog.h"
18 #include "empathy-cell-renderer-expander.h"
19@@ -891,6 +892,25 @@
20 data->button = 0;
21 data->time = event->time;
22 g_idle_add (individual_view_popup_menu_idle_cb, data);
23+ } else if (event->keyval == GDK_KEY_F2) {
24+ FolksIndividual *individual;
25+ EmpathyContact *contact;
26+
27+ g_return_val_if_fail (EMPATHY_IS_INDIVIDUAL_VIEW (view), FALSE);
28+
29+ individual = empathy_individual_view_dup_selected (view);
30+ if (individual == NULL)
31+ return FALSE;
32+
33+ contact = empathy_contact_dup_from_folks_individual (individual);
34+ if (contact == NULL) {
35+ g_object_unref (individual);
36+ return FALSE;
37+ }
38+ empathy_contact_edit_dialog_show (contact, NULL);
39+
40+ g_object_unref (individual);
41+ g_object_unref (contact);
42 }
43
44 return FALSE;
45@@ -1314,7 +1334,8 @@
46 GdkEventKey *eventkey = ((GdkEventKey *) event);
47 gboolean ret = FALSE;
48
49- if (eventkey->keyval == GDK_Up || eventkey->keyval == GDK_Down)
50+ if (eventkey->keyval == GDK_KEY_Up || eventkey->keyval == GDK_KEY_Down
51+ || eventkey->keyval == GDK_KEY_F2)
52 {
53 GdkEvent *new_event;
54
055
=== 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 @@
1From 59a145f0076fd39b5ff624e936dbe3d4dbc49d5b Mon Sep 17 00:00:00 2001
2From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
3Date: Fri, 14 Jan 2011 08:53:04 +0000
4Subject: Improve connected/disconnected notifications (#639352)
5
6---
7Index: empathy-2.32.2/src/empathy-event-manager.c
8===================================================================
9--- empathy-2.32.2.orig/src/empathy-event-manager.c 2010-11-18 09:25:31.000000000 -0500
10+++ empathy-2.32.2/src/empathy-event-manager.c 2011-01-25 13:18:55.713997002 -0500
11@@ -1049,11 +1049,12 @@
12 if (g_settings_get_boolean (gsettings,
13 EMPATHY_PREFS_NOTIFICATIONS_CONTACT_SIGNOUT))
14 {
15- header = g_strdup_printf (_("%s is now offline."),
16+ header = g_strdup_printf ("<b>%s</b>",
17 empathy_contact_get_alias (contact));
18
19- event_manager_add (manager, contact, EMPATHY_EVENT_TYPE_PRESENCE,
20- EMPATHY_IMAGE_AVATAR_DEFAULT, header, NULL, NULL, NULL, NULL);
21+ event_manager_add (manager, contact,
22+ EMPATHY_EVENT_TYPE_PRESENCE, EMPATHY_IMAGE_AVATAR_DEFAULT,
23+ header, _("Disconnected"), NULL, NULL, NULL);
24 }
25 }
26 }
27@@ -1069,11 +1070,12 @@
28 if (g_settings_get_boolean (gsettings,
29 EMPATHY_PREFS_NOTIFICATIONS_CONTACT_SIGNIN))
30 {
31- header = g_strdup_printf (_("%s is now online."),
32+ header = g_strdup_printf ("<b>%s</b>",
33 empathy_contact_get_alias (contact));
34
35- event_manager_add (manager, contact, EMPATHY_EVENT_TYPE_PRESENCE,
36- EMPATHY_IMAGE_AVATAR_DEFAULT, header, NULL, NULL, NULL, NULL);
37+ event_manager_add (manager, contact,
38+ EMPATHY_EVENT_TYPE_PRESENCE, EMPATHY_IMAGE_AVATAR_DEFAULT,
39+ header, _("Connected"), NULL, NULL, NULL);
40 }
41 }
42 }
043
=== 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 @@
1From b4930806a93a8b365400e563b8fa359c00c4016a Mon Sep 17 00:00:00 2001
2From: Robert Sajdok <robert.sajdok@gmail.com>
3Date: Mon, 13 Dec 2010 09:40:23 +0000
4Subject: main-window: add a tooltip on connection error info bars (#626507)
5
6---
7Index: empathy-2.32.2/src/empathy-main-window.c
8===================================================================
9--- empathy-2.32.2.orig/src/empathy-main-window.c 2010-11-18 09:25:31.000000000 -0500
10+++ empathy-2.32.2/src/empathy-main-window.c 2011-01-25 13:42:34.073996998 -0500
11@@ -591,6 +591,7 @@
12 G_CALLBACK (main_window_error_retry_clicked_cb),
13 window);
14
15+ gtk_widget_set_tooltip_text (priv->errors_vbox, error_message);
16 gtk_widget_show (priv->errors_vbox);
17
18 g_hash_table_insert (priv->errors, g_object_ref (account), info_bar);
019
=== 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 @@
100_git_tooltip_on_error_info.patch
200_git_F2_opens_contact_info.patch
300_git_conn_disc_notif.patch
1enable_pidgin_imported_contacts.patch4enable_pidgin_imported_contacts.patch
2reword_subscription_dailog_to_be_less_technical.patch5reword_subscription_dailog_to_be_less_technical.patch
300git_folks_aliasable_groupable.patch600git_folks_aliasable_groupable.patch
47
=== 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 @@
21 --enable-webkit \21 --enable-webkit \
22 --enable-map=no \22 --enable-map=no \
23 --enable-favourite-contacts=no \23 --enable-favourite-contacts=no \
24 --enable-nautilus-sendto24 --enable-nautilus-sendto \
25 --with-ca-file='/etc/ssl/certs/ca-certificates.crt'
2526
26DEB_DBG_PACKAGE_empathy = empathy-dbg27DEB_DBG_PACKAGE_empathy = empathy-dbg
2728

Subscribers

People subscribed via source and target branches