← Back to branch summary

~bcurtiswx/ubuntu/precise/empathy/3.4.2.3-0ubuntu1

« back to all changes in this revision

Viewing changes to debian/patches/34_start_raised_execpt_in_session.patch

  • Committer: Package Import Robot
  • Author(s): Ken VanDine
  • Date: 2012-01-19 11:46:18 UTC
  • mfrom: (1.1.85)
  • Revision ID: package-import@ubuntu.com-20120119114618-zlw2z7fk0hxj60px
Tags: 3.3.4-0ubuntu1
* New upstream release
* refreshed patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/34_start_raised_execpt_in_session.patch
1
 
Description: If not started with the session, we should always raise
2
 
Bug: bugs.launchpad.net/bugs/503052
3
 
 
4
1
=== modified file 'src/empathy-status-icon.c'
5
 
--- old/src/empathy-status-icon.c       2011-06-02 14:12:16 +0000
6
 
+++ new/src/empathy-status-icon.c       2011-06-02 14:23:10 +0000
7
 
@@ -505,6 +505,8 @@
 
2
--- old/src/empathy-status-icon.c       2012-01-19 16:52:20 +0000
 
3
+++ new/src/empathy-status-icon.c       2012-01-19 17:01:01 +0000
 
4
@@ -507,6 +507,8 @@
8
5
        EmpathyStatusIcon     *icon;
9
6
        gboolean               should_hide;
10
7
 
13
10
        g_return_val_if_fail (GTK_IS_WINDOW (window), NULL);
14
11
 
15
12
        icon = g_object_new (EMPATHY_TYPE_STATUS_ICON, NULL);
16
 
@@ -521,8 +523,16 @@
 
13
@@ -523,8 +525,16 @@
17
14
                          icon);
18
15
 
19
16
        if (!hide_contact_list) {
32
29
        } else {
33
30
                should_hide = TRUE;
34
31
        }
 
32