← Back to branch summary

~ubuntu-branches/ubuntu/natty/empathy/natty

« back to all changes in this revision

Viewing changes to debian/patches/00_git_conn_disc_notif.patch

  • Committer: Bazaar Package Importer
  • Author(s): Brian Curtis
  • Date: 2011-01-25 13:20:01 UTC
  • Revision ID: james.westby@ubuntu.com-20110125132001-vyasbmnk6n4d3gvq
Tags: 2.32.2-0ubuntu7
https://launchpad.net/bugs/582757
https://launchpad.net/bugs/387991
https://launchpad.net/bugs/681413
* 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'

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/00_git_conn_disc_notif.patch
 
1
From 59a145f0076fd39b5ff624e936dbe3d4dbc49d5b Mon Sep 17 00:00:00 2001
 
2
From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
 
3
Date: Fri, 14 Jan 2011 08:53:04 +0000
 
4
Subject: Improve connected/disconnected notifications (#639352)
 
5
 
 
6
---
 
7
Index: 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
     }