← Back to branch summary

~ken-vandine/ubuntu/natty/empathy/empathy-2.91.3

« back to all changes in this revision

Viewing changes to debian/patches/31_really_raise_window.patch

  • Committer: Ken VanDine
  • Date: 2010-10-05 04:50:55 UTC
  • Revision ID: ken.vandine@canonical.com-20101005045055-cyu1c6duciot250u
Tags: 2.32.0.1-0ubuntu1
releasing version 2.32.0.1-0ubuntu1

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/31_really_raise_window.patch
2
2
Bug: https://bugs.launchpad.net/bugs/442389
3
3
 
4
4
=== modified file 'libempathy-gtk/empathy-ui-utils.c'
5
 
Index: empathy-2.31.91/libempathy-gtk/empathy-ui-utils.c
6
 
===================================================================
7
 
--- empathy-2.31.91.orig/libempathy-gtk/empathy-ui-utils.c      2010-08-31 15:12:14.120664000 +1000
8
 
+++ empathy-2.31.91/libempathy-gtk/empathy-ui-utils.c   2010-08-31 15:12:46.000664001 +1000
 
5
--- old/libempathy-gtk/empathy-ui-utils.c       2010-10-04 16:50:28 +0000
 
6
+++ new/libempathy-gtk/empathy-ui-utils.c       2010-10-04 17:08:27 +0000
9
7
@@ -1590,6 +1590,41 @@
10
8
        }
11
9
 }
48
46
 /* Takes care of moving the window to the current workspace. */
49
47
 void
50
48
 empathy_window_present_with_time (GtkWindow *window,
51
 
@@ -1620,6 +1655,7 @@
52
 
        gtk_window_present_with_time (window, timestamp);
 
49
@@ -1624,6 +1659,7 @@
 
50
 
53
51
        gtk_window_set_skip_taskbar_hint (window, FALSE);
54
52
        gtk_window_deiconify (window);
55
53
+       really_activate_window (window);
56
54
 }
57
55
 
58
56
 void
59
 
Index: empathy-2.31.91/src/empathy-event-manager.c
60
 
===================================================================
61
 
--- empathy-2.31.91.orig/src/empathy-event-manager.c    2010-08-30 21:29:37.000000000 +1000
62
 
+++ empathy-2.31.91/src/empathy-event-manager.c 2010-08-31 15:12:46.000664001 +1000
 
57
 
 
58
=== modified file 'src/empathy-event-manager.c'
 
59
--- old/src/empathy-event-manager.c     2010-10-04 16:10:27 +0000
 
60
+++ new/src/empathy-event-manager.c     2010-10-04 17:08:27 +0000
63
61
@@ -44,6 +44,7 @@
64
62
 #include <libempathy-gtk/empathy-images.h>
65
63
 #include <libempathy-gtk/empathy-contact-dialogs.h>
77
75
       return;
78
76
     }
79
77
 
 
78