Merge lp:~bcurtiswx/ubuntu/natty/empathy/empathy-2.34.0-0ubuntu1 into lp:~ubuntu-desktop/empathy/ubuntu
- Natty (11.04)
- empathy-2.34.0-0ubuntu1
- Merge into ubuntu
Proposed by
Brian Curtis
Status: | Merged |
---|---|
Merged at revision: | 177 |
Proposed branch: | lp:~bcurtiswx/ubuntu/natty/empathy/empathy-2.34.0-0ubuntu1 |
Merge into: | lp:~ubuntu-desktop/empathy/ubuntu |
Diff against target: |
1089 lines (+203/-285) 12 files modified
debian/changelog (+11/-0) debian/control (+1/-1) debian/patches/01_lpi.patch (+23/-22) debian/patches/02_notifications_focus.patch (+3/-3) debian/patches/10_use_notify_osd_icons.patch (+3/-3) debian/patches/20_libindicate.patch (+97/-98) debian/patches/23_idomessagedialog_for_voip_and_ft.patch (+23/-22) debian/patches/31_really_raise_window.patch (+10/-10) debian/patches/34_start_raised_execpt_in_session.patch (+5/-5) debian/patches/40_unity_launcher_count.patch (+27/-26) debian/patches/42_dont_change_menu_on_focus.patch (+0/-94) debian/patches/series (+0/-1) |
To merge this branch: | bzr merge lp:~bcurtiswx/ubuntu/natty/empathy/empathy-2.34.0-0ubuntu1 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Sponsors | Pending | ||
Review via email: mp+54738@code.launchpad.net |
Commit message
Description of the change
empathy (2.34.0-0ubuntu1) natty; urgency=low
* New upstream release
* debian/control
- Bumped build depends on libtelepathy-glib to >= 0.14.1
* debian/patches
- refreshed patches
- removed patch 42, its upstream now.
-- Brian Curtis <email address hidden> Thu, 24 Mar 2011 12:41:44 -0400
To post a comment you must log in.
Revision history for this message
Marc Deslauriers (mdeslaur) wrote : | # |
Revision history for this message
Marc Deslauriers (mdeslaur) wrote : | # |
Please ignore my previous comment. As has been pointed out to me, gnome has a standing FFe.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'debian/changelog' | |||
2 | --- debian/changelog 2011-03-16 18:46:54 +0000 | |||
3 | +++ debian/changelog 2011-03-24 17:26:45 +0000 | |||
4 | @@ -1,3 +1,14 @@ | |||
5 | 1 | empathy (2.34.0-0ubuntu1) natty; urgency=low | ||
6 | 2 | |||
7 | 3 | * New upstream release | ||
8 | 4 | * debian/control | ||
9 | 5 | - Bumped build depends on libtelepathy-glib to >= 0.14.1 | ||
10 | 6 | * debian/patches | ||
11 | 7 | - refreshed patches | ||
12 | 8 | - removed patch 42, its upstream now. | ||
13 | 9 | |||
14 | 10 | -- Brian Curtis <bcurtiswx@ubuntu.com> Thu, 24 Mar 2011 12:41:44 -0400 | ||
15 | 11 | |||
16 | 1 | empathy (2.33.4-0ubuntu1) natty; urgency=low | 12 | empathy (2.33.4-0ubuntu1) natty; urgency=low |
17 | 2 | 13 | ||
18 | 3 | * New upstream release | 14 | * New upstream release |
19 | 4 | 15 | ||
20 | === modified file 'debian/control' | |||
21 | --- debian/control 2011-03-16 18:46:54 +0000 | |||
22 | +++ debian/control 2011-03-24 17:26:45 +0000 | |||
23 | @@ -18,7 +18,7 @@ | |||
24 | 18 | libglib2.0-dev (>= 2.25.9), | 18 | libglib2.0-dev (>= 2.25.9), |
25 | 19 | libgtk2.0-dev (>= 2.21.2), | 19 | libgtk2.0-dev (>= 2.21.2), |
26 | 20 | libgconf2-dev (>= 1.2.0), | 20 | libgconf2-dev (>= 1.2.0), |
28 | 21 | libtelepathy-glib-dev (>= 0.13.17), | 21 | libtelepathy-glib-dev (>= 0.14.1), |
29 | 22 | libtelepathy-logger-dev (>= 0.2.0), | 22 | libtelepathy-logger-dev (>= 0.2.0), |
30 | 23 | libebook1.2-dev, | 23 | libebook1.2-dev, |
31 | 24 | intltool, | 24 | intltool, |
32 | 25 | 25 | ||
33 | === modified file 'debian/patches/01_lpi.patch' | |||
34 | --- debian/patches/01_lpi.patch 2011-02-24 18:21:05 +0000 | |||
35 | +++ debian/patches/01_lpi.patch 2011-03-24 17:26:45 +0000 | |||
36 | @@ -1,7 +1,9 @@ | |||
37 | 1 | === modified file 'configure.ac' | 1 | === modified file 'configure.ac' |
41 | 2 | --- old/configure.ac 2011-02-24 17:01:06 +0000 | 2 | Index: empathy-2.34.0/configure.ac |
42 | 3 | +++ new/configure.ac 2011-02-24 17:01:49 +0000 | 3 | =================================================================== |
43 | 4 | @@ -160,6 +160,7 @@ | 4 | --- empathy-2.34.0.orig/configure.ac 2011-03-24 11:18:11.000000000 -0400 |
44 | 5 | +++ empathy-2.34.0/configure.ac 2011-03-24 12:46:07.198547066 -0400 | ||
45 | 6 | @@ -161,6 +161,7 @@ | ||
46 | 5 | telepathy-glib >= $TELEPATHY_GLIB_REQUIRED | 7 | telepathy-glib >= $TELEPATHY_GLIB_REQUIRED |
47 | 6 | telepathy-logger-0.2 >= $TELEPATHY_LOGGER | 8 | telepathy-logger-0.2 >= $TELEPATHY_LOGGER |
48 | 7 | x11 | 9 | x11 |
49 | @@ -9,10 +11,10 @@ | |||
50 | 9 | ]) | 11 | ]) |
51 | 10 | 12 | ||
52 | 11 | PKG_CHECK_MODULES(YELL, [telepathy-yell]) | 13 | PKG_CHECK_MODULES(YELL, [telepathy-yell]) |
57 | 12 | 14 | Index: empathy-2.34.0/src/empathy-chat-window.c | |
58 | 13 | === modified file 'src/empathy-chat-window.c' | 15 | =================================================================== |
59 | 14 | --- old/src/empathy-chat-window.c 2011-02-24 17:01:06 +0000 | 16 | --- empathy-2.34.0.orig/src/empathy-chat-window.c 2011-03-24 11:15:16.000000000 -0400 |
60 | 15 | +++ new/src/empathy-chat-window.c 2011-02-24 17:01:49 +0000 | 17 | +++ empathy-2.34.0/src/empathy-chat-window.c 2011-03-24 12:46:07.198547066 -0400 |
61 | 16 | @@ -36,6 +36,9 @@ | 18 | @@ -36,6 +36,9 @@ |
62 | 17 | #include <glib/gi18n.h> | 19 | #include <glib/gi18n.h> |
63 | 18 | #include <libnotify/notification.h> | 20 | #include <libnotify/notification.h> |
64 | @@ -23,7 +25,7 @@ | |||
65 | 23 | #include <telepathy-glib/telepathy-glib.h> | 25 | #include <telepathy-glib/telepathy-glib.h> |
66 | 24 | 26 | ||
67 | 25 | #include <libempathy/empathy-contact.h> | 27 | #include <libempathy/empathy-contact.h> |
69 | 26 | @@ -2069,6 +2072,9 @@ | 28 | @@ -2090,6 +2093,9 @@ |
70 | 27 | chat_window_chat_manager_chats_changed_cb (priv->chat_manager, | 29 | chat_window_chat_manager_chats_changed_cb (priv->chat_manager, |
71 | 28 | empathy_chat_manager_get_num_chats (priv->chat_manager), | 30 | empathy_chat_manager_get_num_chats (priv->chat_manager), |
72 | 29 | window); | 31 | window); |
73 | @@ -33,10 +35,10 @@ | |||
74 | 33 | } | 35 | } |
75 | 34 | 36 | ||
76 | 35 | EmpathyChatWindow * | 37 | EmpathyChatWindow * |
81 | 36 | 38 | Index: empathy-2.34.0/src/empathy-chat-window.ui | |
82 | 37 | === modified file 'src/empathy-chat-window.ui' | 39 | =================================================================== |
83 | 38 | --- old/src/empathy-chat-window.ui 2011-02-24 17:01:06 +0000 | 40 | --- empathy-2.34.0.orig/src/empathy-chat-window.ui 2011-02-24 05:12:45.000000000 -0500 |
84 | 39 | +++ new/src/empathy-chat-window.ui 2011-02-24 17:01:49 +0000 | 41 | +++ empathy-2.34.0/src/empathy-chat-window.ui 2011-03-24 12:46:07.198547066 -0400 |
85 | 40 | @@ -197,6 +197,7 @@ | 42 | @@ -197,6 +197,7 @@ |
86 | 41 | </menu> | 43 | </menu> |
87 | 42 | <menu action="menu_help"> | 44 | <menu action="menu_help"> |
88 | @@ -45,10 +47,10 @@ | |||
89 | 45 | <menuitem action="menu_help_about"/> | 47 | <menuitem action="menu_help_about"/> |
90 | 46 | </menu> | 48 | </menu> |
91 | 47 | </menubar> | 49 | </menubar> |
96 | 48 | 50 | Index: empathy-2.34.0/src/empathy-main-window.c | |
97 | 49 | === modified file 'src/empathy-main-window.c' | 51 | =================================================================== |
98 | 50 | --- old/src/empathy-main-window.c 2011-02-24 17:01:06 +0000 | 52 | --- empathy-2.34.0.orig/src/empathy-main-window.c 2011-03-24 11:15:16.000000000 -0400 |
99 | 51 | +++ new/src/empathy-main-window.c 2011-02-24 17:01:49 +0000 | 53 | +++ empathy-2.34.0/src/empathy-main-window.c 2011-03-24 12:46:07.198547066 -0400 |
100 | 52 | @@ -33,6 +33,9 @@ | 54 | @@ -33,6 +33,9 @@ |
101 | 53 | #include <telepathy-glib/util.h> | 55 | #include <telepathy-glib/util.h> |
102 | 54 | #include <folks/folks.h> | 56 | #include <folks/folks.h> |
103 | @@ -59,7 +61,7 @@ | |||
104 | 59 | #include <libempathy/empathy-contact.h> | 61 | #include <libempathy/empathy-contact.h> |
105 | 60 | #include <libempathy/empathy-idle.h> | 62 | #include <libempathy/empathy-idle.h> |
106 | 61 | #include <libempathy/empathy-utils.h> | 63 | #include <libempathy/empathy-utils.h> |
108 | 62 | @@ -1973,6 +1976,8 @@ | 64 | @@ -2112,6 +2115,8 @@ |
109 | 63 | main_window_notify_contact_list_size_cb (priv->gsettings_ui, | 65 | main_window_notify_contact_list_size_cb (priv->gsettings_ui, |
110 | 64 | EMPATHY_PREFS_UI_SHOW_AVATARS, | 66 | EMPATHY_PREFS_UI_SHOW_AVATARS, |
111 | 65 | window); | 67 | window); |
112 | @@ -68,10 +70,10 @@ | |||
113 | 68 | } | 70 | } |
114 | 69 | 71 | ||
115 | 70 | GtkWidget * | 72 | GtkWidget * |
120 | 71 | 73 | Index: empathy-2.34.0/src/empathy-main-window.ui | |
121 | 72 | === modified file 'src/empathy-main-window.ui' | 74 | =================================================================== |
122 | 73 | --- old/src/empathy-main-window.ui 2011-02-24 17:01:06 +0000 | 75 | --- empathy-2.34.0.orig/src/empathy-main-window.ui 2011-03-24 11:15:16.000000000 -0400 |
123 | 74 | +++ new/src/empathy-main-window.ui 2011-02-24 17:01:49 +0000 | 76 | +++ empathy-2.34.0/src/empathy-main-window.ui 2011-03-24 12:46:07.198547066 -0400 |
124 | 75 | @@ -277,6 +277,7 @@ | 77 | @@ -277,6 +277,7 @@ |
125 | 76 | <menu action="help"> | 78 | <menu action="help"> |
126 | 77 | <menuitem action="help_contents"/> | 79 | <menuitem action="help_contents"/> |
127 | @@ -80,4 +82,3 @@ | |||
128 | 80 | <menuitem action="help_about"/> | 82 | <menuitem action="help_about"/> |
129 | 81 | </menu> | 83 | </menu> |
130 | 82 | </menubar> | 84 | </menubar> |
131 | 83 | |||
132 | 84 | 85 | ||
133 | === modified file 'debian/patches/02_notifications_focus.patch' | |||
134 | --- debian/patches/02_notifications_focus.patch 2010-08-05 07:52:48 +0000 | |||
135 | +++ debian/patches/02_notifications_focus.patch 2011-03-24 17:26:45 +0000 | |||
136 | @@ -1,10 +1,10 @@ | |||
137 | 1 | ## Description: add some description | 1 | ## Description: add some description |
138 | 2 | ## Origin/Author: add some origin or author | 2 | ## Origin/Author: add some origin or author |
139 | 3 | ## Bug: bug URL | 3 | ## Bug: bug URL |
141 | 4 | Index: empathy-2.31.6/data/org.gnome.Empathy.gschema.xml.in | 4 | Index: empathy-2.34.0/data/org.gnome.Empathy.gschema.xml.in |
142 | 5 | =================================================================== | 5 | =================================================================== |
145 | 6 | --- empathy-2.31.6.orig/data/org.gnome.Empathy.gschema.xml.in 2010-07-13 22:26:34.000000000 +1000 | 6 | --- empathy-2.34.0.orig/data/org.gnome.Empathy.gschema.xml.in 2011-03-24 11:15:16.000000000 -0400 |
146 | 7 | +++ empathy-2.31.6/data/org.gnome.Empathy.gschema.xml.in 2010-08-05 17:30:05.022584053 +1000 | 7 | +++ empathy-2.34.0/data/org.gnome.Empathy.gschema.xml.in 2011-03-24 12:46:14.568547064 -0400 |
147 | 8 | @@ -153,7 +153,7 @@ | 8 | @@ -153,7 +153,7 @@ |
148 | 9 | <_description>Whether to show popup notifications when away or busy.</_description> | 9 | <_description>Whether to show popup notifications when away or busy.</_description> |
149 | 10 | </key> | 10 | </key> |
150 | 11 | 11 | ||
151 | === modified file 'debian/patches/10_use_notify_osd_icons.patch' | |||
152 | --- debian/patches/10_use_notify_osd_icons.patch 2010-06-18 06:11:00 +0000 | |||
153 | +++ debian/patches/10_use_notify_osd_icons.patch 2011-03-24 17:26:45 +0000 | |||
154 | @@ -6,10 +6,10 @@ | |||
155 | 6 | Date: Thu, 17 Sep 2009 17:42:26 +1000 | 6 | Date: Thu, 17 Sep 2009 17:42:26 +1000 |
156 | 7 | Subject: [PATCH] Use the notify-osd image for new messages | 7 | Subject: [PATCH] Use the notify-osd image for new messages |
157 | 8 | 8 | ||
159 | 9 | Index: empathy-2.31.3/libempathy-gtk/empathy-images.h | 9 | Index: empathy-2.34.0/libempathy-gtk/empathy-images.h |
160 | 10 | =================================================================== | 10 | =================================================================== |
163 | 11 | --- empathy-2.31.3.orig/libempathy-gtk/empathy-images.h 2010-06-18 12:19:59.454507811 +1000 | 11 | --- empathy-2.34.0.orig/libempathy-gtk/empathy-images.h 2011-02-10 07:10:24.000000000 -0500 |
164 | 12 | +++ empathy-2.31.3/libempathy-gtk/empathy-images.h 2010-06-18 12:20:06.804510537 +1000 | 12 | +++ empathy-2.34.0/libempathy-gtk/empathy-images.h 2011-03-24 12:46:17.428547064 -0400 |
165 | 13 | @@ -36,7 +36,7 @@ | 13 | @@ -36,7 +36,7 @@ |
166 | 14 | #define EMPATHY_IMAGE_PENDING "empathy-pending" | 14 | #define EMPATHY_IMAGE_PENDING "empathy-pending" |
167 | 15 | 15 | ||
168 | 16 | 16 | ||
169 | === modified file 'debian/patches/20_libindicate.patch' | |||
170 | --- debian/patches/20_libindicate.patch 2011-02-24 18:21:05 +0000 | |||
171 | +++ debian/patches/20_libindicate.patch 2011-03-24 17:26:45 +0000 | |||
172 | @@ -1,7 +1,9 @@ | |||
173 | 1 | === modified file 'configure.ac' | 1 | === modified file 'configure.ac' |
177 | 2 | --- old/configure.ac 2011-02-24 17:03:13 +0000 | 2 | Index: empathy-2.34.0/configure.ac |
178 | 3 | +++ new/configure.ac 2011-02-24 17:03:53 +0000 | 3 | =================================================================== |
179 | 4 | @@ -55,6 +55,8 @@ | 4 | --- empathy-2.34.0.orig/configure.ac 2011-03-24 12:46:07.198547066 -0400 |
180 | 5 | +++ empathy-2.34.0/configure.ac 2011-03-24 12:46:24.808547063 -0400 | ||
181 | 6 | @@ -56,6 +56,8 @@ | ||
182 | 5 | NETWORK_MANAGER_REQUIRED=0.7.0 | 7 | NETWORK_MANAGER_REQUIRED=0.7.0 |
183 | 6 | WEBKIT_REQUIRED=1.1.15 | 8 | WEBKIT_REQUIRED=1.1.15 |
184 | 7 | GNOME_CONTROL_CENTER_GTK3_REQUIRED=2.31.4 | 9 | GNOME_CONTROL_CENTER_GTK3_REQUIRED=2.31.4 |
185 | @@ -53,10 +55,10 @@ | |||
186 | 53 | Spell checking (enchant)....: ${have_enchant} | 55 | Spell checking (enchant)....: ${have_enchant} |
187 | 54 | Display maps (libchamplain).: ${have_libchamplain} | 56 | Display maps (libchamplain).: ${have_libchamplain} |
188 | 55 | Location awareness (Geoclue): ${have_geoclue} | 57 | Location awareness (Geoclue): ${have_geoclue} |
193 | 56 | 58 | Index: empathy-2.34.0/data/org.gnome.Empathy.gschema.xml.in | |
194 | 57 | === modified file 'data/org.gnome.Empathy.gschema.xml.in' | 59 | =================================================================== |
195 | 58 | --- old/data/org.gnome.Empathy.gschema.xml.in 2011-02-24 17:03:47 +0000 | 60 | --- empathy-2.34.0.orig/data/org.gnome.Empathy.gschema.xml.in 2011-03-24 12:46:14.568547064 -0400 |
196 | 59 | +++ new/data/org.gnome.Empathy.gschema.xml.in 2011-02-24 17:03:53 +0000 | 61 | +++ empathy-2.34.0/data/org.gnome.Empathy.gschema.xml.in 2011-03-24 12:46:24.808547063 -0400 |
197 | 60 | @@ -86,6 +86,11 @@ | 62 | @@ -86,6 +86,11 @@ |
198 | 61 | <_summary>The position for the chat window side pane</_summary> | 63 | <_summary>The position for the chat window side pane</_summary> |
199 | 62 | <_description>The stored position (in pixels) of the chat window side pane.</_description> | 64 | <_description>The stored position (in pixels) of the chat window side pane.</_description> |
200 | @@ -69,23 +71,33 @@ | |||
201 | 69 | </schema> | 71 | </schema> |
202 | 70 | <schema id="org.gnome.Empathy.contacts" path="/apps/empathy/contacts/"> | 72 | <schema id="org.gnome.Empathy.contacts" path="/apps/empathy/contacts/"> |
203 | 71 | <key name="sort-criterium" type="s"> | 73 | <key name="sort-criterium" type="s"> |
209 | 72 | 74 | Index: empathy-2.34.0/libempathy-gtk/empathy-ui-utils.c | |
210 | 73 | === modified file 'libempathy-gtk/empathy-ui-utils.c' | 75 | =================================================================== |
211 | 74 | --- old/libempathy-gtk/empathy-ui-utils.c 2011-02-24 17:01:06 +0000 | 76 | --- empathy-2.34.0.orig/libempathy-gtk/empathy-ui-utils.c 2011-03-24 11:15:16.000000000 -0400 |
212 | 75 | +++ new/libempathy-gtk/empathy-ui-utils.c 2011-02-24 17:03:53 +0000 | 77 | +++ empathy-2.34.0/libempathy-gtk/empathy-ui-utils.c 2011-03-24 12:46:24.808547063 -0400 |
213 | 76 | @@ -1564,25 +1564,36 @@ | 78 | @@ -1567,25 +1567,36 @@ |
214 | 77 | Display *dpy; | 79 | Display *dpy; |
215 | 78 | GdkWindow *gdk_window; | 80 | GdkWindow *gdk_window; |
216 | 79 | 81 | ||
217 | 80 | - gtk_status_icon_get_geometry (status_icon, NULL, &icon_location, NULL); | 82 | - gtk_status_icon_get_geometry (status_icon, NULL, &icon_location, NULL); |
218 | 81 | - gdk_window = gtk_widget_get_window (GTK_WIDGET (window)); | 83 | - gdk_window = gtk_widget_get_window (GTK_WIDGET (window)); |
219 | 82 | - dpy = gdk_x11_drawable_get_xdisplay (gdk_window); | 84 | - dpy = gdk_x11_drawable_get_xdisplay (gdk_window); |
221 | 83 | - | 85 | + // If the status icon isn't visible (because indicators are used) then |
222 | 86 | + // attempting to change the properties of the status icon doesn't work. | ||
223 | 87 | + if (gtk_status_icon_get_visible (status_icon)) { | ||
224 | 88 | + gtk_status_icon_get_geometry (status_icon, NULL, &icon_location, NULL); | ||
225 | 89 | + gdk_window = gtk_widget_get_window (GTK_WIDGET (window)); | ||
226 | 90 | + dpy = gdk_x11_drawable_get_xdisplay (gdk_window); | ||
227 | 91 | |||
228 | 84 | - data[0] = icon_location.x; | 92 | - data[0] = icon_location.x; |
229 | 85 | - data[1] = icon_location.y; | 93 | - data[1] = icon_location.y; |
230 | 86 | - data[2] = icon_location.width; | 94 | - data[2] = icon_location.width; |
231 | 87 | - data[3] = icon_location.height; | 95 | - data[3] = icon_location.height; |
233 | 88 | - | 96 | + data[0] = icon_location.x; |
234 | 97 | + data[1] = icon_location.y; | ||
235 | 98 | + data[2] = icon_location.width; | ||
236 | 99 | + data[3] = icon_location.height; | ||
237 | 100 | |||
238 | 89 | - XChangeProperty (dpy, | 101 | - XChangeProperty (dpy, |
239 | 90 | - GDK_WINDOW_XID (gdk_window), | 102 | - GDK_WINDOW_XID (gdk_window), |
240 | 91 | - gdk_x11_get_xatom_by_name_for_display ( | 103 | - gdk_x11_get_xatom_by_name_for_display ( |
241 | @@ -93,18 +105,6 @@ | |||
242 | 93 | - "_NET_WM_ICON_GEOMETRY"), | 105 | - "_NET_WM_ICON_GEOMETRY"), |
243 | 94 | - XA_CARDINAL, 32, PropModeReplace, | 106 | - XA_CARDINAL, 32, PropModeReplace, |
244 | 95 | - (guchar *)&data, 4); | 107 | - (guchar *)&data, 4); |
245 | 96 | + // If the status icon isn't visible (because indicators are used) then | ||
246 | 97 | + // attempting to change the properties of the status icon doesn't work. | ||
247 | 98 | + if (gtk_status_icon_get_visible (status_icon)) { | ||
248 | 99 | + gtk_status_icon_get_geometry (status_icon, NULL, &icon_location, NULL); | ||
249 | 100 | + gdk_window = gtk_widget_get_window (GTK_WIDGET (window)); | ||
250 | 101 | + dpy = gdk_x11_drawable_get_xdisplay (gdk_window); | ||
251 | 102 | + | ||
252 | 103 | + data[0] = icon_location.x; | ||
253 | 104 | + data[1] = icon_location.y; | ||
254 | 105 | + data[2] = icon_location.width; | ||
255 | 106 | + data[3] = icon_location.height; | ||
256 | 107 | + | ||
257 | 108 | + XChangeProperty (dpy, | 108 | + XChangeProperty (dpy, |
258 | 109 | + GDK_WINDOW_XID (gdk_window), | 109 | + GDK_WINDOW_XID (gdk_window), |
259 | 110 | + gdk_x11_get_xatom_by_name_for_display ( | 110 | + gdk_x11_get_xatom_by_name_for_display ( |
260 | @@ -127,10 +127,10 @@ | |||
261 | 127 | } | 127 | } |
262 | 128 | 128 | ||
263 | 129 | /* Takes care of moving the window to the current workspace. */ | 129 | /* Takes care of moving the window to the current workspace. */ |
268 | 130 | 130 | Index: empathy-2.34.0/libempathy/empathy-gsettings.h | |
269 | 131 | === modified file 'libempathy/empathy-gsettings.h' | 131 | =================================================================== |
270 | 132 | --- old/libempathy/empathy-gsettings.h 2011-02-24 17:01:06 +0000 | 132 | --- empathy-2.34.0.orig/libempathy/empathy-gsettings.h 2011-03-24 11:15:16.000000000 -0400 |
271 | 133 | +++ new/libempathy/empathy-gsettings.h 2011-02-24 17:03:53 +0000 | 133 | +++ empathy-2.34.0/libempathy/empathy-gsettings.h 2011-03-24 12:46:24.808547063 -0400 |
272 | 134 | @@ -71,6 +71,7 @@ | 134 | @@ -71,6 +71,7 @@ |
273 | 135 | #define EMPATHY_PREFS_UI_SHOW_AVATARS "show-avatars" | 135 | #define EMPATHY_PREFS_UI_SHOW_AVATARS "show-avatars" |
274 | 136 | #define EMPATHY_PREFS_UI_SHOW_PROTOCOLS "show-protocols" | 136 | #define EMPATHY_PREFS_UI_SHOW_PROTOCOLS "show-protocols" |
275 | @@ -139,11 +139,11 @@ | |||
276 | 139 | #define EMPATHY_PREFS_UI_CHAT_WINDOW_PANED_POS "chat-window-paned-pos" | 139 | #define EMPATHY_PREFS_UI_CHAT_WINDOW_PANED_POS "chat-window-paned-pos" |
277 | 140 | #define EMPATHY_PREFS_UI_SHOW_OFFLINE "show-offline" | 140 | #define EMPATHY_PREFS_UI_SHOW_OFFLINE "show-offline" |
278 | 141 | 141 | ||
284 | 142 | 142 | Index: empathy-2.34.0/po/POTFILES.in | |
285 | 143 | === modified file 'po/POTFILES.in' | 143 | =================================================================== |
286 | 144 | --- old/po/POTFILES.in 2011-02-24 17:01:06 +0000 | 144 | --- empathy-2.34.0.orig/po/POTFILES.in 2011-03-24 11:38:49.000000000 -0400 |
287 | 145 | +++ new/po/POTFILES.in 2011-02-24 17:03:53 +0000 | 145 | +++ empathy-2.34.0/po/POTFILES.in 2011-03-24 12:46:24.808547063 -0400 |
288 | 146 | @@ -94,6 +94,8 @@ | 146 | @@ -95,6 +95,8 @@ |
289 | 147 | [type: gettext/glade]src/empathy-ft-manager.ui | 147 | [type: gettext/glade]src/empathy-ft-manager.ui |
290 | 148 | src/empathy-import-dialog.c | 148 | src/empathy-import-dialog.c |
291 | 149 | src/empathy-import-widget.c | 149 | src/empathy-import-widget.c |
292 | @@ -152,10 +152,10 @@ | |||
293 | 152 | [type: gettext/glade]src/empathy-import-dialog.ui | 152 | [type: gettext/glade]src/empathy-import-dialog.ui |
294 | 153 | src/empathy-import-widget.c | 153 | src/empathy-import-widget.c |
295 | 154 | src/empathy-main-window.c | 154 | src/empathy-main-window.c |
300 | 155 | 155 | Index: empathy-2.34.0/src/Makefile.am | |
301 | 156 | === modified file 'src/Makefile.am' | 156 | =================================================================== |
302 | 157 | --- old/src/Makefile.am 2011-02-24 17:01:06 +0000 | 157 | --- empathy-2.34.0.orig/src/Makefile.am 2011-03-24 11:15:16.000000000 -0400 |
303 | 158 | +++ new/src/Makefile.am 2011-02-24 17:03:53 +0000 | 158 | +++ empathy-2.34.0/src/Makefile.am 2011-03-24 12:46:24.808547063 -0400 |
304 | 159 | @@ -8,6 +8,7 @@ | 159 | @@ -8,6 +8,7 @@ |
305 | 160 | $(ERROR_CFLAGS) \ | 160 | $(ERROR_CFLAGS) \ |
306 | 161 | -I$(top_srcdir) \ | 161 | -I$(top_srcdir) \ |
307 | @@ -180,7 +180,7 @@ | |||
308 | 180 | $(UNIQUE_LIBS) \ | 180 | $(UNIQUE_LIBS) \ |
309 | 181 | $(EMPATHY_LIBS) \ | 181 | $(EMPATHY_LIBS) \ |
310 | 182 | $(GTK_LIBS) \ | 182 | $(GTK_LIBS) \ |
312 | 183 | @@ -199,6 +202,7 @@ | 183 | @@ -200,6 +203,7 @@ |
313 | 184 | $(LIBNOTIFY_LIBS) \ | 184 | $(LIBNOTIFY_LIBS) \ |
314 | 185 | $(UNIQUE_LIBS) \ | 185 | $(UNIQUE_LIBS) \ |
315 | 186 | $(EMPATHY_LIBS) \ | 186 | $(EMPATHY_LIBS) \ |
316 | @@ -188,7 +188,7 @@ | |||
317 | 188 | $(LIBCHAMPLAIN_LIBS) \ | 188 | $(LIBCHAMPLAIN_LIBS) \ |
318 | 189 | $(WEBKIT_LIBS) \ | 189 | $(WEBKIT_LIBS) \ |
319 | 190 | $(NULL) | 190 | $(NULL) |
321 | 191 | @@ -231,6 +235,18 @@ | 191 | @@ -232,6 +236,18 @@ |
322 | 192 | $(autostart_DATA) \ | 192 | $(autostart_DATA) \ |
323 | 193 | $(ui_DATA) | 193 | $(ui_DATA) |
324 | 194 | 194 | ||
325 | @@ -207,10 +207,10 @@ | |||
326 | 207 | if HAVE_LIBCHAMPLAIN | 207 | if HAVE_LIBCHAMPLAIN |
327 | 208 | empathy_handwritten_source += \ | 208 | empathy_handwritten_source += \ |
328 | 209 | empathy-map-view.c \ | 209 | empathy-map-view.c \ |
333 | 210 | 210 | Index: empathy-2.34.0/src/empathy-chat-window.c | |
334 | 211 | === modified file 'src/empathy-chat-window.c' | 211 | =================================================================== |
335 | 212 | --- old/src/empathy-chat-window.c 2011-02-24 17:03:13 +0000 | 212 | --- empathy-2.34.0.orig/src/empathy-chat-window.c 2011-03-24 12:46:07.198547066 -0400 |
336 | 213 | +++ new/src/empathy-chat-window.c 2011-02-24 17:03:53 +0000 | 213 | +++ empathy-2.34.0/src/empathy-chat-window.c 2011-03-24 12:46:24.808547063 -0400 |
337 | 214 | @@ -63,6 +63,11 @@ | 214 | @@ -63,6 +63,11 @@ |
338 | 215 | #include "empathy-about-dialog.h" | 215 | #include "empathy-about-dialog.h" |
339 | 216 | #include "empathy-invite-participant-dialog.h" | 216 | #include "empathy-invite-participant-dialog.h" |
340 | @@ -236,7 +236,7 @@ | |||
341 | 236 | GtkTargetList *contact_targets; | 236 | GtkTargetList *contact_targets; |
342 | 237 | GtkTargetList *file_targets; | 237 | GtkTargetList *file_targets; |
343 | 238 | 238 | ||
345 | 239 | @@ -1257,6 +1266,72 @@ | 239 | @@ -1278,6 +1287,72 @@ |
346 | 240 | } | 240 | } |
347 | 241 | } | 241 | } |
348 | 242 | 242 | ||
349 | @@ -309,7 +309,7 @@ | |||
350 | 309 | static void | 309 | static void |
351 | 310 | chat_window_show_or_update_notification (EmpathyChatWindow *window, | 310 | chat_window_show_or_update_notification (EmpathyChatWindow *window, |
352 | 311 | EmpathyMessage *message, | 311 | EmpathyMessage *message, |
354 | 312 | @@ -1433,6 +1508,9 @@ | 312 | @@ -1454,6 +1529,9 @@ |
355 | 313 | 313 | ||
356 | 314 | empathy_sound_play (GTK_WIDGET (priv->dialog), | 314 | empathy_sound_play (GTK_WIDGET (priv->dialog), |
357 | 315 | EMPATHY_SOUND_MESSAGE_INCOMING); | 315 | EMPATHY_SOUND_MESSAGE_INCOMING); |
358 | @@ -319,7 +319,7 @@ | |||
359 | 319 | 319 | ||
360 | 320 | /* Pending messages have already been displayed in the approver, so we don't | 320 | /* Pending messages have already been displayed in the approver, so we don't |
361 | 321 | * display a notification for those. */ | 321 | * display a notification for those. */ |
363 | 322 | @@ -1505,6 +1583,10 @@ | 322 | @@ -1526,6 +1604,10 @@ |
364 | 323 | empathy_chat_messages_read (chat); | 323 | empathy_chat_messages_read (chat); |
365 | 324 | 324 | ||
366 | 325 | chat_window_update_chat_tab (chat); | 325 | chat_window_update_chat_tab (chat); |
367 | @@ -330,9 +330,9 @@ | |||
368 | 330 | } | 330 | } |
369 | 331 | 331 | ||
370 | 332 | static void | 332 | static void |
372 | 333 | @@ -1621,6 +1703,11 @@ | 333 | @@ -1642,6 +1724,11 @@ |
373 | 334 | /* Update the title, since we now mark all unread messages as read. */ | 334 | /* Update the title, since we now mark all unread messages as read. */ |
375 | 335 | chat_window_update_chat_tab (priv->current_chat); | 335 | chat_window_update_chat_tab_full (priv->current_chat, FALSE); |
376 | 336 | 336 | ||
377 | 337 | +#ifdef HAVE_LIBINDICATE | 337 | +#ifdef HAVE_LIBINDICATE |
378 | 338 | + /* Remove the indicator for the active chat */ | 338 | + /* Remove the indicator for the active chat */ |
379 | @@ -342,7 +342,7 @@ | |||
380 | 342 | return FALSE; | 342 | return FALSE; |
381 | 343 | } | 343 | } |
382 | 344 | 344 | ||
384 | 345 | @@ -1965,6 +2052,11 @@ | 345 | @@ -1986,6 +2073,11 @@ |
385 | 346 | g_object_unref (gui); | 346 | g_object_unref (gui); |
386 | 347 | 347 | ||
387 | 348 | priv->chatroom_manager = empathy_chatroom_manager_dup_singleton (NULL); | 348 | priv->chatroom_manager = empathy_chatroom_manager_dup_singleton (NULL); |
388 | @@ -354,10 +354,10 @@ | |||
389 | 354 | 354 | ||
390 | 355 | priv->notebook = gtk_notebook_new (); | 355 | priv->notebook = gtk_notebook_new (); |
391 | 356 | gtk_notebook_set_group (GTK_NOTEBOOK (priv->notebook), "EmpathyChatWindow"); | 356 | gtk_notebook_set_group (GTK_NOTEBOOK (priv->notebook), "EmpathyChatWindow"); |
396 | 357 | 357 | Index: empathy-2.34.0/src/empathy-indicator-manager.c | |
397 | 358 | === added file 'src/empathy-indicator-manager.c' | 358 | =================================================================== |
398 | 359 | --- old/src/empathy-indicator-manager.c 1970-01-01 00:00:00 +0000 | 359 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
399 | 360 | +++ new/src/empathy-indicator-manager.c 2011-02-24 17:03:53 +0000 | 360 | +++ empathy-2.34.0/src/empathy-indicator-manager.c 2011-03-24 12:46:24.808547063 -0400 |
400 | 361 | @@ -0,0 +1,467 @@ | 361 | @@ -0,0 +1,467 @@ |
401 | 362 | +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ | 362 | +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ |
402 | 363 | +/* | 363 | +/* |
403 | @@ -826,10 +826,10 @@ | |||
404 | 826 | + G_CALLBACK (indicate_login_cb), manager); | 826 | + G_CALLBACK (indicate_login_cb), manager); |
405 | 827 | + empathy_indicator_show (e_indicator); | 827 | + empathy_indicator_show (e_indicator); |
406 | 828 | +} | 828 | +} |
411 | 829 | 829 | Index: empathy-2.34.0/src/empathy-indicator-manager.h | |
412 | 830 | === added file 'src/empathy-indicator-manager.h' | 830 | =================================================================== |
413 | 831 | --- old/src/empathy-indicator-manager.h 1970-01-01 00:00:00 +0000 | 831 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
414 | 832 | +++ new/src/empathy-indicator-manager.h 2011-02-24 17:03:53 +0000 | 832 | +++ empathy-2.34.0/src/empathy-indicator-manager.h 2011-03-24 12:46:24.808547063 -0400 |
415 | 833 | @@ -0,0 +1,77 @@ | 833 | @@ -0,0 +1,77 @@ |
416 | 834 | +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ | 834 | +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ |
417 | 835 | +/* | 835 | +/* |
418 | @@ -908,10 +908,10 @@ | |||
419 | 908 | +G_END_DECLS | 908 | +G_END_DECLS |
420 | 909 | + | 909 | + |
421 | 910 | +#endif /* __EMPATHY_INDICATOR_MANAGER_H__ */ | 910 | +#endif /* __EMPATHY_INDICATOR_MANAGER_H__ */ |
426 | 911 | 911 | Index: empathy-2.34.0/src/empathy-indicator.c | |
427 | 912 | === added file 'src/empathy-indicator.c' | 912 | =================================================================== |
428 | 913 | --- old/src/empathy-indicator.c 1970-01-01 00:00:00 +0000 | 913 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
429 | 914 | +++ new/src/empathy-indicator.c 2011-02-24 17:03:53 +0000 | 914 | +++ empathy-2.34.0/src/empathy-indicator.c 2011-03-24 12:46:24.808547063 -0400 |
430 | 915 | @@ -0,0 +1,325 @@ | 915 | @@ -0,0 +1,325 @@ |
431 | 916 | +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ | 916 | +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ |
432 | 917 | +/* | 917 | +/* |
433 | @@ -1238,10 +1238,10 @@ | |||
434 | 1238 | + g_object_get (e_indicator, "contact", &contact, NULL); | 1238 | + g_object_get (e_indicator, "contact", &contact, NULL); |
435 | 1239 | + return contact; | 1239 | + return contact; |
436 | 1240 | +} | 1240 | +} |
441 | 1241 | 1241 | Index: empathy-2.34.0/src/empathy-indicator.h | |
442 | 1242 | === added file 'src/empathy-indicator.h' | 1242 | =================================================================== |
443 | 1243 | --- old/src/empathy-indicator.h 1970-01-01 00:00:00 +0000 | 1243 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
444 | 1244 | +++ new/src/empathy-indicator.h 2011-02-24 17:03:53 +0000 | 1244 | +++ empathy-2.34.0/src/empathy-indicator.h 2011-03-24 12:46:24.808547063 -0400 |
445 | 1245 | @@ -0,0 +1,65 @@ | 1245 | @@ -0,0 +1,65 @@ |
446 | 1246 | +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ | 1246 | +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ |
447 | 1247 | +/* | 1247 | +/* |
448 | @@ -1308,11 +1308,11 @@ | |||
449 | 1308 | + | 1308 | + |
450 | 1309 | + | 1309 | + |
451 | 1310 | +#endif /* __EMPATHY-INDICATOR_H__ */ | 1310 | +#endif /* __EMPATHY-INDICATOR_H__ */ |
457 | 1311 | 1311 | Index: empathy-2.34.0/src/empathy-main-window.c | |
458 | 1312 | === modified file 'src/empathy-main-window.c' | 1312 | =================================================================== |
459 | 1313 | --- old/src/empathy-main-window.c 2011-02-24 17:03:13 +0000 | 1313 | --- empathy-2.34.0.orig/src/empathy-main-window.c 2011-03-24 12:46:07.198547066 -0400 |
460 | 1314 | +++ new/src/empathy-main-window.c 2011-02-24 17:03:53 +0000 | 1314 | +++ empathy-2.34.0/src/empathy-main-window.c 2011-03-24 12:46:24.808547063 -0400 |
461 | 1315 | @@ -81,6 +81,10 @@ | 1315 | @@ -82,6 +82,10 @@ |
462 | 1316 | #include "empathy-ft-manager.h" | 1316 | #include "empathy-ft-manager.h" |
463 | 1317 | #include "empathy-migrate-butterfly-logs.h" | 1317 | #include "empathy-migrate-butterfly-logs.h" |
464 | 1318 | 1318 | ||
465 | @@ -1323,7 +1323,7 @@ | |||
466 | 1323 | #define DEBUG_FLAG EMPATHY_DEBUG_OTHER | 1323 | #define DEBUG_FLAG EMPATHY_DEBUG_OTHER |
467 | 1324 | #include <libempathy/empathy-debug.h> | 1324 | #include <libempathy/empathy-debug.h> |
468 | 1325 | 1325 | ||
470 | 1326 | @@ -159,6 +163,10 @@ | 1326 | @@ -161,6 +165,10 @@ |
471 | 1327 | 1327 | ||
472 | 1328 | /* Actions that are enabled when there are connected accounts */ | 1328 | /* Actions that are enabled when there are connected accounts */ |
473 | 1329 | GList *actions_connected; | 1329 | GList *actions_connected; |
474 | @@ -1334,7 +1334,7 @@ | |||
475 | 1334 | 1334 | ||
476 | 1335 | /* The idle event source to migrate butterfly's logs */ | 1335 | /* The idle event source to migrate butterfly's logs */ |
477 | 1336 | guint butterfly_log_migration_members_changed_id; | 1336 | guint butterfly_log_migration_members_changed_id; |
479 | 1337 | @@ -431,11 +439,23 @@ | 1337 | @@ -433,11 +441,23 @@ |
480 | 1338 | EmpathyEvent *event, | 1338 | EmpathyEvent *event, |
481 | 1339 | EmpathyMainWindow *window) | 1339 | EmpathyMainWindow *window) |
482 | 1340 | { | 1340 | { |
483 | @@ -1358,7 +1358,7 @@ | |||
484 | 1358 | } | 1358 | } |
485 | 1359 | 1359 | ||
486 | 1360 | static void | 1360 | static void |
488 | 1361 | @@ -867,6 +887,10 @@ | 1361 | @@ -1004,6 +1024,10 @@ |
489 | 1362 | g_object_unref (priv->ui_manager); | 1362 | g_object_unref (priv->ui_manager); |
490 | 1363 | g_object_unref (priv->chatroom_manager); | 1363 | g_object_unref (priv->chatroom_manager); |
491 | 1364 | 1364 | ||
492 | @@ -1369,7 +1369,7 @@ | |||
493 | 1369 | g_object_unref (priv->gsettings_ui); | 1369 | g_object_unref (priv->gsettings_ui); |
494 | 1370 | g_object_unref (priv->gsettings_contacts); | 1370 | g_object_unref (priv->gsettings_contacts); |
495 | 1371 | 1371 | ||
497 | 1372 | @@ -1933,6 +1957,10 @@ | 1372 | @@ -2072,6 +2096,10 @@ |
498 | 1373 | l = l->next; | 1373 | l = l->next; |
499 | 1374 | } | 1374 | } |
500 | 1375 | 1375 | ||
501 | @@ -1380,10 +1380,10 @@ | |||
502 | 1380 | /* Show offline ? */ | 1380 | /* Show offline ? */ |
503 | 1381 | show_offline = g_settings_get_boolean (priv->gsettings_ui, | 1381 | show_offline = g_settings_get_boolean (priv->gsettings_ui, |
504 | 1382 | EMPATHY_PREFS_UI_SHOW_OFFLINE); | 1382 | EMPATHY_PREFS_UI_SHOW_OFFLINE); |
509 | 1383 | 1383 | Index: empathy-2.34.0/src/empathy-preferences.c | |
510 | 1384 | === modified file 'src/empathy-preferences.c' | 1384 | =================================================================== |
511 | 1385 | --- old/src/empathy-preferences.c 2011-02-24 17:01:06 +0000 | 1385 | --- empathy-2.34.0.orig/src/empathy-preferences.c 2011-03-24 11:15:16.000000000 -0400 |
512 | 1386 | +++ new/src/empathy-preferences.c 2011-02-24 17:03:53 +0000 | 1386 | +++ empathy-2.34.0/src/empathy-preferences.c 2011-03-24 12:46:24.818547063 -0400 |
513 | 1387 | @@ -56,6 +56,7 @@ | 1387 | @@ -56,6 +56,7 @@ |
514 | 1388 | 1388 | ||
515 | 1389 | GtkWidget *checkbutton_show_smileys; | 1389 | GtkWidget *checkbutton_show_smileys; |
516 | @@ -1417,10 +1417,10 @@ | |||
517 | 1417 | "combobox_chat_theme", &priv->combobox_chat_theme, | 1417 | "combobox_chat_theme", &priv->combobox_chat_theme, |
518 | 1418 | "checkbutton_separate_chat_windows", &priv->checkbutton_separate_chat_windows, | 1418 | "checkbutton_separate_chat_windows", &priv->checkbutton_separate_chat_windows, |
519 | 1419 | "checkbutton_events_notif_area", &priv->checkbutton_events_notif_area, | 1419 | "checkbutton_events_notif_area", &priv->checkbutton_events_notif_area, |
524 | 1420 | 1420 | Index: empathy-2.34.0/src/empathy-preferences.ui | |
525 | 1421 | === modified file 'src/empathy-preferences.ui' | 1421 | =================================================================== |
526 | 1422 | --- old/src/empathy-preferences.ui 2011-02-24 17:01:06 +0000 | 1422 | --- empathy-2.34.0.orig/src/empathy-preferences.ui 2011-02-10 07:10:25.000000000 -0500 |
527 | 1423 | +++ new/src/empathy-preferences.ui 2011-02-24 17:03:53 +0000 | 1423 | +++ empathy-2.34.0/src/empathy-preferences.ui 2011-03-24 12:46:24.818547063 -0400 |
528 | 1424 | @@ -266,6 +266,20 @@ | 1424 | @@ -266,6 +266,20 @@ |
529 | 1425 | <property name="position">1</property> | 1425 | <property name="position">1</property> |
530 | 1426 | </packing> | 1426 | </packing> |
531 | @@ -1442,10 +1442,10 @@ | |||
532 | 1442 | </object> | 1442 | </object> |
533 | 1443 | <packing> | 1443 | <packing> |
534 | 1444 | <property name="position">1</property> | 1444 | <property name="position">1</property> |
539 | 1445 | 1445 | Index: empathy-2.34.0/src/empathy-status-icon.c | |
540 | 1446 | === modified file 'src/empathy-status-icon.c' | 1446 | =================================================================== |
541 | 1447 | --- old/src/empathy-status-icon.c 2011-02-24 17:01:06 +0000 | 1447 | --- empathy-2.34.0.orig/src/empathy-status-icon.c 2011-03-24 11:15:16.000000000 -0400 |
542 | 1448 | +++ new/src/empathy-status-icon.c 2011-02-24 17:03:53 +0000 | 1448 | +++ empathy-2.34.0/src/empathy-status-icon.c 2011-03-24 12:46:24.818547063 -0400 |
543 | 1449 | @@ -29,6 +29,7 @@ | 1449 | @@ -29,6 +29,7 @@ |
544 | 1450 | #include <gdk/gdkkeysyms.h> | 1450 | #include <gdk/gdkkeysyms.h> |
545 | 1451 | #include <glib/gi18n.h> | 1451 | #include <glib/gi18n.h> |
546 | @@ -1454,7 +1454,7 @@ | |||
547 | 1454 | #include <libnotify/notification.h> | 1454 | #include <libnotify/notification.h> |
548 | 1455 | #include <libnotify/notify.h> | 1455 | #include <libnotify/notify.h> |
549 | 1456 | 1456 | ||
551 | 1457 | @@ -50,6 +51,12 @@ | 1457 | @@ -52,6 +53,12 @@ |
552 | 1458 | #include "empathy-preferences.h" | 1458 | #include "empathy-preferences.h" |
553 | 1459 | #include "empathy-event-manager.h" | 1459 | #include "empathy-event-manager.h" |
554 | 1460 | 1460 | ||
555 | @@ -1467,7 +1467,7 @@ | |||
556 | 1467 | #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER | 1467 | #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER |
557 | 1468 | #include <libempathy/empathy-debug.h> | 1468 | #include <libempathy/empathy-debug.h> |
558 | 1469 | 1469 | ||
560 | 1470 | @@ -74,6 +81,10 @@ | 1470 | @@ -76,6 +83,10 @@ |
561 | 1471 | GtkAction *show_window_item; | 1471 | GtkAction *show_window_item; |
562 | 1472 | GtkAction *new_message_item; | 1472 | GtkAction *new_message_item; |
563 | 1473 | GtkAction *status_item; | 1473 | GtkAction *status_item; |
564 | @@ -1478,7 +1478,7 @@ | |||
565 | 1478 | } EmpathyStatusIconPriv; | 1478 | } EmpathyStatusIconPriv; |
566 | 1479 | 1479 | ||
567 | 1480 | G_DEFINE_TYPE (EmpathyStatusIcon, empathy_status_icon, G_TYPE_OBJECT); | 1480 | G_DEFINE_TYPE (EmpathyStatusIcon, empathy_status_icon, G_TYPE_OBJECT); |
569 | 1481 | @@ -424,6 +435,92 @@ | 1481 | @@ -457,6 +468,92 @@ |
570 | 1482 | empathy_window_present (GTK_WINDOW (priv->window)); | 1482 | empathy_window_present (GTK_WINDOW (priv->window)); |
571 | 1483 | } | 1483 | } |
572 | 1484 | } | 1484 | } |
573 | @@ -1571,7 +1571,7 @@ | |||
574 | 1571 | 1571 | ||
575 | 1572 | static void | 1572 | static void |
576 | 1573 | status_icon_notify_visibility_cb (GSettings *gsettings, | 1573 | status_icon_notify_visibility_cb (GSettings *gsettings, |
578 | 1574 | @@ -443,10 +540,36 @@ | 1574 | @@ -476,10 +573,36 @@ |
579 | 1575 | EmpathyStatusIconPriv *priv = GET_PRIV (icon); | 1575 | EmpathyStatusIconPriv *priv = GET_PRIV (icon); |
580 | 1576 | gboolean visible; | 1576 | gboolean visible; |
581 | 1577 | 1577 | ||
582 | @@ -1608,7 +1608,7 @@ | |||
583 | 1608 | static void | 1608 | static void |
584 | 1609 | status_icon_presence_changed_cb (EmpathyStatusIcon *icon) | 1609 | status_icon_presence_changed_cb (EmpathyStatusIcon *icon) |
585 | 1610 | { | 1610 | { |
587 | 1611 | @@ -630,6 +753,9 @@ | 1611 | @@ -663,6 +786,9 @@ |
588 | 1612 | g_object_unref (priv->notify_mgr); | 1612 | g_object_unref (priv->notify_mgr); |
589 | 1613 | g_object_unref (priv->gsettings_ui); | 1613 | g_object_unref (priv->gsettings_ui); |
590 | 1614 | g_object_unref (priv->window); | 1614 | g_object_unref (priv->window); |
591 | @@ -1618,7 +1618,7 @@ | |||
592 | 1618 | } | 1618 | } |
593 | 1619 | 1619 | ||
594 | 1620 | static void | 1620 | static void |
596 | 1621 | @@ -690,6 +816,13 @@ | 1621 | @@ -723,6 +849,13 @@ |
597 | 1622 | G_CALLBACK (status_icon_notify_visibility_cb), | 1622 | G_CALLBACK (status_icon_notify_visibility_cb), |
598 | 1623 | icon); | 1623 | icon); |
599 | 1624 | 1624 | ||
600 | @@ -1632,7 +1632,7 @@ | |||
601 | 1632 | status_icon_create_menu (icon); | 1632 | status_icon_create_menu (icon); |
602 | 1633 | 1633 | ||
603 | 1634 | g_signal_connect_swapped (priv->account_manager, | 1634 | g_signal_connect_swapped (priv->account_manager, |
605 | 1635 | @@ -722,6 +855,9 @@ | 1635 | @@ -755,6 +888,9 @@ |
606 | 1636 | EmpathyStatusIconPriv *priv; | 1636 | EmpathyStatusIconPriv *priv; |
607 | 1637 | EmpathyStatusIcon *icon; | 1637 | EmpathyStatusIcon *icon; |
608 | 1638 | gboolean should_hide; | 1638 | gboolean should_hide; |
609 | @@ -1642,7 +1642,7 @@ | |||
610 | 1642 | 1642 | ||
611 | 1643 | g_return_val_if_fail (GTK_IS_WINDOW (window), NULL); | 1643 | g_return_val_if_fail (GTK_IS_WINDOW (window), NULL); |
612 | 1644 | 1644 | ||
614 | 1645 | @@ -729,6 +865,24 @@ | 1645 | @@ -762,6 +898,24 @@ |
615 | 1646 | priv = GET_PRIV (icon); | 1646 | priv = GET_PRIV (icon); |
616 | 1647 | 1647 | ||
617 | 1648 | priv->window = g_object_ref (window); | 1648 | priv->window = g_object_ref (window); |
618 | @@ -1667,7 +1667,7 @@ | |||
619 | 1667 | 1667 | ||
620 | 1668 | g_signal_connect_after (priv->window, "key-press-event", | 1668 | g_signal_connect_after (priv->window, "key-press-event", |
621 | 1669 | G_CALLBACK (status_icon_key_press_event_cb), | 1669 | G_CALLBACK (status_icon_key_press_event_cb), |
623 | 1670 | @@ -745,6 +899,12 @@ | 1670 | @@ -778,6 +932,12 @@ |
624 | 1671 | should_hide = TRUE; | 1671 | should_hide = TRUE; |
625 | 1672 | } | 1672 | } |
626 | 1673 | 1673 | ||
627 | @@ -1680,4 +1680,3 @@ | |||
628 | 1680 | status_icon_set_visibility (icon, !should_hide, FALSE); | 1680 | status_icon_set_visibility (icon, !should_hide, FALSE); |
629 | 1681 | 1681 | ||
630 | 1682 | return icon; | 1682 | return icon; |
631 | 1683 | |||
632 | 1684 | 1683 | ||
633 | === modified file 'debian/patches/23_idomessagedialog_for_voip_and_ft.patch' | |||
634 | --- debian/patches/23_idomessagedialog_for_voip_and_ft.patch 2011-03-16 18:46:54 +0000 | |||
635 | +++ debian/patches/23_idomessagedialog_for_voip_and_ft.patch 2011-03-24 17:26:45 +0000 | |||
636 | @@ -1,8 +1,10 @@ | |||
637 | 1 | === modified file 'configure.ac' | 1 | === modified file 'configure.ac' |
640 | 2 | --- old/configure.ac 2011-03-16 17:51:02 +0000 | 2 | Index: empathy-2.34.0/configure.ac |
641 | 3 | +++ new/configure.ac 2011-03-16 17:51:24 +0000 | 3 | =================================================================== |
642 | 4 | --- empathy-2.34.0.orig/configure.ac 2011-03-24 12:59:57.738546917 -0400 | ||
643 | 5 | +++ empathy-2.34.0/configure.ac 2011-03-24 13:00:00.018546918 -0400 | ||
644 | 4 | @@ -44,6 +44,7 @@ | 6 | @@ -44,6 +44,7 @@ |
646 | 5 | TELEPATHY_GLIB_REQUIRED=0.13.17 | 7 | TELEPATHY_GLIB_REQUIRED=0.14.1 |
647 | 6 | TELEPATHY_LOGGER=0.2.0 | 8 | TELEPATHY_LOGGER=0.2.0 |
648 | 7 | UNIQUE_REQUIRED=1.1.2 | 9 | UNIQUE_REQUIRED=1.1.2 |
649 | 8 | +IDO_REQUIRED=0.1.14 | 10 | +IDO_REQUIRED=0.1.14 |
650 | @@ -17,10 +19,10 @@ | |||
651 | 17 | x11 | 19 | x11 |
652 | 18 | launchpad-integration | 20 | launchpad-integration |
653 | 19 | ]) | 21 | ]) |
658 | 20 | 22 | Index: empathy-2.34.0/src/empathy-event-manager.c | |
659 | 21 | === modified file 'src/empathy-event-manager.c' | 23 | =================================================================== |
660 | 22 | --- old/src/empathy-event-manager.c 2011-03-16 17:50:03 +0000 | 24 | --- empathy-2.34.0.orig/src/empathy-event-manager.c 2011-03-24 11:15:16.000000000 -0400 |
661 | 23 | +++ new/src/empathy-event-manager.c 2011-03-16 17:51:24 +0000 | 25 | +++ empathy-2.34.0/src/empathy-event-manager.c 2011-03-24 13:00:00.018546918 -0400 |
662 | 24 | @@ -48,6 +48,9 @@ | 26 | @@ -48,6 +48,9 @@ |
663 | 25 | #include <libempathy-gtk/empathy-contact-dialogs.h> | 27 | #include <libempathy-gtk/empathy-contact-dialogs.h> |
664 | 26 | #include <libempathy-gtk/empathy-sound.h> | 28 | #include <libempathy-gtk/empathy-sound.h> |
665 | @@ -31,7 +33,7 @@ | |||
666 | 31 | #include "empathy-event-manager.h" | 33 | #include "empathy-event-manager.h" |
667 | 32 | #include "empathy-main-window.h" | 34 | #include "empathy-main-window.h" |
668 | 33 | 35 | ||
670 | 34 | @@ -470,6 +473,7 @@ | 36 | @@ -473,6 +476,7 @@ |
671 | 35 | } | 37 | } |
672 | 36 | } | 38 | } |
673 | 37 | 39 | ||
674 | @@ -39,7 +41,7 @@ | |||
675 | 39 | static void | 41 | static void |
676 | 40 | event_manager_call_window_confirmation_dialog_response_cb (GtkDialog *dialog, | 42 | event_manager_call_window_confirmation_dialog_response_cb (GtkDialog *dialog, |
677 | 41 | gint response, gpointer user_data) | 43 | gint response, gpointer user_data) |
679 | 42 | @@ -490,13 +494,75 @@ | 44 | @@ -499,13 +503,75 @@ |
680 | 43 | } | 45 | } |
681 | 44 | 46 | ||
682 | 45 | static void | 47 | static void |
683 | @@ -113,10 +115,10 @@ | |||
684 | 113 | - gchar *title; | 115 | - gchar *title; |
685 | 114 | + gint width, height; | 116 | + gint width, height; |
686 | 115 | + GdkPixbuf *avatar; | 117 | + GdkPixbuf *avatar; |
687 | 118 | EmpathyEventType etype = event->public.type; | ||
688 | 116 | 119 | ||
689 | 117 | if (event->approval->dialog != NULL) | 120 | if (event->approval->dialog != NULL) |
692 | 118 | { | 121 | @@ -532,33 +598,33 @@ |
691 | 119 | @@ -522,33 +588,33 @@ | ||
693 | 120 | return; | 122 | return; |
694 | 121 | } | 123 | } |
695 | 122 | 124 | ||
696 | @@ -169,7 +171,7 @@ | |||
697 | 169 | 171 | ||
698 | 170 | gtk_message_dialog_set_image (GTK_MESSAGE_DIALOG (dialog), image); | 172 | gtk_message_dialog_set_image (GTK_MESSAGE_DIALOG (dialog), image); |
699 | 171 | gtk_widget_show (image); | 173 | gtk_widget_show (image); |
701 | 172 | @@ -934,7 +1000,7 @@ | 174 | @@ -955,7 +1021,7 @@ |
702 | 173 | event_manager_add (approval->manager, NULL, | 175 | event_manager_add (approval->manager, NULL, |
703 | 174 | approval->contact, EMPATHY_EVENT_TYPE_TRANSFER, | 176 | approval->contact, EMPATHY_EVENT_TYPE_TRANSFER, |
704 | 175 | EMPATHY_IMAGE_DOCUMENT_SEND, header, NULL, | 177 | EMPATHY_IMAGE_DOCUMENT_SEND, header, NULL, |
705 | @@ -178,10 +180,10 @@ | |||
706 | 178 | 180 | ||
707 | 179 | /* FIXME better sound for incoming file transfers ?*/ | 181 | /* FIXME better sound for incoming file transfers ?*/ |
708 | 180 | empathy_sound_play (window, EMPATHY_SOUND_CONVERSATION_NEW); | 182 | empathy_sound_play (window, EMPATHY_SOUND_CONVERSATION_NEW); |
713 | 181 | 183 | Index: empathy-2.34.0/src/empathy-indicator-manager.c | |
714 | 182 | === modified file 'src/empathy-indicator-manager.c' | 184 | =================================================================== |
715 | 183 | --- old/src/empathy-indicator-manager.c 2011-03-16 17:51:02 +0000 | 185 | --- empathy-2.34.0.orig/src/empathy-indicator-manager.c 2011-03-24 12:59:59.218546917 -0400 |
716 | 184 | +++ new/src/empathy-indicator-manager.c 2011-03-16 17:51:24 +0000 | 186 | +++ empathy-2.34.0/src/empathy-indicator-manager.c 2011-03-24 13:00:00.018546918 -0400 |
717 | 185 | @@ -144,6 +144,12 @@ | 187 | @@ -144,6 +144,12 @@ |
718 | 186 | EmpathyEvent *event, | 188 | EmpathyEvent *event, |
719 | 187 | EmpathyIndicatorManager *manager) | 189 | EmpathyIndicatorManager *manager) |
720 | @@ -195,11 +197,11 @@ | |||
721 | 195 | EmpathyIndicator *indicator = NULL; | 197 | EmpathyIndicator *indicator = NULL; |
722 | 196 | EmpathyIndicatorManagerPriv *priv; | 198 | EmpathyIndicatorManagerPriv *priv; |
723 | 197 | IndicatorEvent *indicator_event; | 199 | IndicatorEvent *indicator_event; |
729 | 198 | 200 | Index: empathy-2.34.0/src/empathy-status-icon.c | |
730 | 199 | === modified file 'src/empathy-status-icon.c' | 201 | =================================================================== |
731 | 200 | --- old/src/empathy-status-icon.c 2011-03-16 17:51:02 +0000 | 202 | --- empathy-2.34.0.orig/src/empathy-status-icon.c 2011-03-24 12:59:57.748546917 -0400 |
732 | 201 | +++ new/src/empathy-status-icon.c 2011-03-16 17:51:24 +0000 | 203 | +++ empathy-2.34.0/src/empathy-status-icon.c 2011-03-24 13:00:00.018546918 -0400 |
733 | 202 | @@ -193,6 +193,12 @@ | 204 | @@ -226,6 +226,12 @@ |
734 | 203 | } | 205 | } |
735 | 204 | 206 | ||
736 | 205 | if (priv->event) { | 207 | if (priv->event) { |
737 | @@ -212,4 +214,3 @@ | |||
738 | 212 | gchar *message_esc = NULL; | 214 | gchar *message_esc = NULL; |
739 | 213 | gboolean has_x_canonical_append; | 215 | gboolean has_x_canonical_append; |
740 | 214 | NotifyNotification *notification = priv->notification; | 216 | NotifyNotification *notification = priv->notification; |
741 | 215 | |||
742 | 216 | 217 | ||
743 | === modified file 'debian/patches/31_really_raise_window.patch' | |||
744 | --- debian/patches/31_really_raise_window.patch 2011-02-02 16:27:25 +0000 | |||
745 | +++ debian/patches/31_really_raise_window.patch 2011-03-24 17:26:45 +0000 | |||
746 | @@ -2,11 +2,11 @@ | |||
747 | 2 | Bug: https://bugs.launchpad.net/bugs/442389 | 2 | Bug: https://bugs.launchpad.net/bugs/442389 |
748 | 3 | 3 | ||
749 | 4 | === modified file 'libempathy-gtk/empathy-ui-utils.c' | 4 | === modified file 'libempathy-gtk/empathy-ui-utils.c' |
751 | 5 | Index: empathy-2.33.1/libempathy-gtk/empathy-ui-utils.c | 5 | Index: empathy-2.34.0/libempathy-gtk/empathy-ui-utils.c |
752 | 6 | =================================================================== | 6 | =================================================================== |
756 | 7 | --- empathy-2.33.1.orig/libempathy-gtk/empathy-ui-utils.c 2011-02-02 11:22:39.271459005 -0500 | 7 | --- empathy-2.34.0.orig/libempathy-gtk/empathy-ui-utils.c 2011-03-24 13:00:13.538546915 -0400 |
757 | 8 | +++ empathy-2.33.1/libempathy-gtk/empathy-ui-utils.c 2011-02-02 11:22:49.651459020 -0500 | 8 | +++ empathy-2.34.0/libempathy-gtk/empathy-ui-utils.c 2011-03-24 13:00:15.558546915 -0400 |
758 | 9 | @@ -1596,6 +1596,41 @@ | 9 | @@ -1599,6 +1599,41 @@ |
759 | 10 | } | 10 | } |
760 | 11 | } | 11 | } |
761 | 12 | 12 | ||
762 | @@ -48,7 +48,7 @@ | |||
763 | 48 | /* Takes care of moving the window to the current workspace. */ | 48 | /* Takes care of moving the window to the current workspace. */ |
764 | 49 | void | 49 | void |
765 | 50 | empathy_window_present_with_time (GtkWindow *window, | 50 | empathy_window_present_with_time (GtkWindow *window, |
767 | 51 | @@ -1630,6 +1665,7 @@ | 51 | @@ -1633,6 +1668,7 @@ |
768 | 52 | 52 | ||
769 | 53 | gtk_window_set_skip_taskbar_hint (window, FALSE); | 53 | gtk_window_set_skip_taskbar_hint (window, FALSE); |
770 | 54 | gtk_window_deiconify (window); | 54 | gtk_window_deiconify (window); |
771 | @@ -56,11 +56,11 @@ | |||
772 | 56 | } | 56 | } |
773 | 57 | 57 | ||
774 | 58 | void | 58 | void |
776 | 59 | Index: empathy-2.33.1/src/empathy-event-manager.c | 59 | Index: empathy-2.34.0/src/empathy-event-manager.c |
777 | 60 | =================================================================== | 60 | =================================================================== |
781 | 61 | --- empathy-2.33.1.orig/src/empathy-event-manager.c 2011-02-02 11:22:44.251459011 -0500 | 61 | --- empathy-2.34.0.orig/src/empathy-event-manager.c 2011-03-24 13:00:14.768546916 -0400 |
782 | 62 | +++ empathy-2.33.1/src/empathy-event-manager.c 2011-02-02 11:22:49.651459020 -0500 | 62 | +++ empathy-2.34.0/src/empathy-event-manager.c 2011-03-24 13:00:15.558546915 -0400 |
783 | 63 | @@ -44,6 +44,7 @@ | 63 | @@ -47,6 +47,7 @@ |
784 | 64 | #include <libempathy-gtk/empathy-images.h> | 64 | #include <libempathy-gtk/empathy-images.h> |
785 | 65 | #include <libempathy-gtk/empathy-contact-dialogs.h> | 65 | #include <libempathy-gtk/empathy-contact-dialogs.h> |
786 | 66 | #include <libempathy-gtk/empathy-sound.h> | 66 | #include <libempathy-gtk/empathy-sound.h> |
787 | @@ -68,7 +68,7 @@ | |||
788 | 68 | 68 | ||
789 | 69 | #include <libido/idomessagedialog.h> | 69 | #include <libido/idomessagedialog.h> |
790 | 70 | #include <libempathy-gtk/empathy-ui-utils.h> | 70 | #include <libempathy-gtk/empathy-ui-utils.h> |
792 | 71 | @@ -495,7 +496,7 @@ | 71 | @@ -513,7 +514,7 @@ |
793 | 72 | 72 | ||
794 | 73 | if (event->approval->dialog != NULL) | 73 | if (event->approval->dialog != NULL) |
795 | 74 | { | 74 | { |
796 | 75 | 75 | ||
797 | === modified file 'debian/patches/34_start_raised_execpt_in_session.patch' | |||
798 | --- debian/patches/34_start_raised_execpt_in_session.patch 2011-02-02 16:27:25 +0000 | |||
799 | +++ debian/patches/34_start_raised_execpt_in_session.patch 2011-03-24 17:26:45 +0000 | |||
800 | @@ -2,11 +2,11 @@ | |||
801 | 2 | Bug: bugs.launchpad.net/bugs/503052 | 2 | Bug: bugs.launchpad.net/bugs/503052 |
802 | 3 | 3 | ||
803 | 4 | === modified file 'src/empathy-status-icon.c' | 4 | === modified file 'src/empathy-status-icon.c' |
805 | 5 | Index: empathy-2.33.1/src/empathy-status-icon.c | 5 | Index: empathy-2.34.0/src/empathy-status-icon.c |
806 | 6 | =================================================================== | 6 | =================================================================== |
810 | 7 | --- empathy-2.33.1.orig/src/empathy-status-icon.c 2011-02-02 11:22:44.251459011 -0500 | 7 | --- empathy-2.34.0.orig/src/empathy-status-icon.c 2011-03-24 13:00:33.598546912 -0400 |
811 | 8 | +++ empathy-2.33.1/src/empathy-status-icon.c 2011-02-02 11:22:52.711459000 -0500 | 8 | +++ empathy-2.34.0/src/empathy-status-icon.c 2011-03-24 13:00:37.008546911 -0400 |
812 | 9 | @@ -865,6 +865,9 @@ | 9 | @@ -897,6 +897,9 @@ |
813 | 10 | #ifdef HAVE_LIBINDICATE | 10 | #ifdef HAVE_LIBINDICATE |
814 | 11 | gboolean use_libindicate; | 11 | gboolean use_libindicate; |
815 | 12 | #endif | 12 | #endif |
816 | @@ -16,7 +16,7 @@ | |||
817 | 16 | 16 | ||
818 | 17 | g_return_val_if_fail (GTK_IS_WINDOW (window), NULL); | 17 | g_return_val_if_fail (GTK_IS_WINDOW (window), NULL); |
819 | 18 | 18 | ||
821 | 19 | @@ -900,8 +903,16 @@ | 19 | @@ -932,8 +935,16 @@ |
822 | 20 | icon); | 20 | icon); |
823 | 21 | 21 | ||
824 | 22 | if (!hide_contact_list) { | 22 | if (!hide_contact_list) { |
825 | 23 | 23 | ||
826 | === modified file 'debian/patches/40_unity_launcher_count.patch' | |||
827 | --- debian/patches/40_unity_launcher_count.patch 2011-02-24 18:21:05 +0000 | |||
828 | +++ debian/patches/40_unity_launcher_count.patch 2011-03-24 17:26:45 +0000 | |||
829 | @@ -1,7 +1,9 @@ | |||
830 | 1 | === modified file 'configure.ac' | 1 | === modified file 'configure.ac' |
834 | 2 | --- old/configure.ac 2011-02-24 17:06:45 +0000 | 2 | Index: empathy-2.34.0/configure.ac |
835 | 3 | +++ new/configure.ac 2011-02-24 17:09:26 +0000 | 3 | =================================================================== |
836 | 4 | @@ -58,6 +58,7 @@ | 4 | --- empathy-2.34.0.orig/configure.ac 2011-03-24 13:00:46.878546910 -0400 |
837 | 5 | +++ empathy-2.34.0/configure.ac 2011-03-24 13:00:50.978546908 -0400 | ||
838 | 6 | @@ -59,6 +59,7 @@ | ||
839 | 5 | GNOME_CONTROL_CENTER_GTK3_REQUIRED=2.31.4 | 7 | GNOME_CONTROL_CENTER_GTK3_REQUIRED=2.31.4 |
840 | 6 | INDICATE_REQUIRED=0.4.91 | 8 | INDICATE_REQUIRED=0.4.91 |
841 | 7 | INDICATE_GTK_REQUIRED=0.4.91 | 9 | INDICATE_GTK_REQUIRED=0.4.91 |
842 | @@ -60,10 +62,10 @@ | |||
843 | 60 | Spell checking (enchant)....: ${have_enchant} | 62 | Spell checking (enchant)....: ${have_enchant} |
844 | 61 | Display maps (libchamplain).: ${have_libchamplain} | 63 | Display maps (libchamplain).: ${have_libchamplain} |
845 | 62 | Location awareness (Geoclue): ${have_geoclue} | 64 | Location awareness (Geoclue): ${have_geoclue} |
850 | 63 | 65 | Index: empathy-2.34.0/src/Makefile.am | |
851 | 64 | === modified file 'src/Makefile.am' | 66 | =================================================================== |
852 | 65 | --- old/src/Makefile.am 2011-02-24 17:04:31 +0000 | 67 | --- empathy-2.34.0.orig/src/Makefile.am 2011-03-24 13:00:46.318546910 -0400 |
853 | 66 | +++ new/src/Makefile.am 2011-02-24 17:09:26 +0000 | 68 | +++ empathy-2.34.0/src/Makefile.am 2011-03-24 13:00:50.978546908 -0400 |
854 | 67 | @@ -19,6 +19,7 @@ | 69 | @@ -19,6 +19,7 @@ |
855 | 68 | $(CPPFLAGS_COMMON) \ | 70 | $(CPPFLAGS_COMMON) \ |
856 | 69 | $(LIBNOTIFY_CFLAGS) \ | 71 | $(LIBNOTIFY_CFLAGS) \ |
857 | @@ -80,7 +82,7 @@ | |||
858 | 80 | $(UNIQUE_LIBS) \ | 82 | $(UNIQUE_LIBS) \ |
859 | 81 | $(EMPATHY_LIBS) \ | 83 | $(EMPATHY_LIBS) \ |
860 | 82 | $(GTK_LIBS) \ | 84 | $(GTK_LIBS) \ |
862 | 83 | @@ -203,6 +205,7 @@ | 85 | @@ -204,6 +206,7 @@ |
863 | 84 | $(UNIQUE_LIBS) \ | 86 | $(UNIQUE_LIBS) \ |
864 | 85 | $(EMPATHY_LIBS) \ | 87 | $(EMPATHY_LIBS) \ |
865 | 86 | $(INDICATE_LIBS) \ | 88 | $(INDICATE_LIBS) \ |
866 | @@ -88,10 +90,10 @@ | |||
867 | 88 | $(LIBCHAMPLAIN_LIBS) \ | 90 | $(LIBCHAMPLAIN_LIBS) \ |
868 | 89 | $(WEBKIT_LIBS) \ | 91 | $(WEBKIT_LIBS) \ |
869 | 90 | $(NULL) | 92 | $(NULL) |
874 | 91 | 93 | Index: empathy-2.34.0/src/empathy-chat-window.c | |
875 | 92 | === modified file 'src/empathy-chat-window.c' | 94 | =================================================================== |
876 | 93 | --- old/src/empathy-chat-window.c 2011-02-24 17:04:31 +0000 | 95 | --- empathy-2.34.0.orig/src/empathy-chat-window.c 2011-03-24 13:00:46.318546910 -0400 |
877 | 94 | +++ new/src/empathy-chat-window.c 2011-02-24 17:09:26 +0000 | 96 | +++ empathy-2.34.0/src/empathy-chat-window.c 2011-03-24 13:00:50.978546908 -0400 |
878 | 95 | @@ -71,6 +71,10 @@ | 97 | @@ -71,6 +71,10 @@ |
879 | 96 | #define DEBUG_FLAG EMPATHY_DEBUG_CHAT | 98 | #define DEBUG_FLAG EMPATHY_DEBUG_CHAT |
880 | 97 | #include <libempathy/empathy-debug.h> | 99 | #include <libempathy/empathy-debug.h> |
881 | @@ -113,7 +115,7 @@ | |||
882 | 113 | GtkTargetList *contact_targets; | 115 | GtkTargetList *contact_targets; |
883 | 114 | GtkTargetList *file_targets; | 116 | GtkTargetList *file_targets; |
884 | 115 | 117 | ||
886 | 116 | @@ -1308,8 +1315,19 @@ | 118 | @@ -1329,8 +1336,19 @@ |
887 | 117 | sender, body); | 119 | sender, body); |
888 | 118 | g_signal_connect (indicator, "activate", | 120 | g_signal_connect (indicator, "activate", |
889 | 119 | G_CALLBACK (chat_window_indicator_activate_cb), chat); | 121 | G_CALLBACK (chat_window_indicator_activate_cb), chat); |
890 | @@ -134,7 +136,7 @@ | |||
891 | 134 | } | 136 | } |
892 | 135 | empathy_indicator_show (indicator); | 137 | empathy_indicator_show (indicator); |
893 | 136 | } | 138 | } |
895 | 137 | @@ -1326,6 +1344,25 @@ | 139 | @@ -1347,6 +1365,25 @@ |
896 | 138 | DEBUG ("indicator is %p", indicator); | 140 | DEBUG ("indicator is %p", indicator); |
897 | 139 | empathy_indicator_hide (indicator); | 141 | empathy_indicator_hide (indicator); |
898 | 140 | g_hash_table_remove (priv->indicators, chat); | 142 | g_hash_table_remove (priv->indicators, chat); |
899 | @@ -160,7 +162,7 @@ | |||
900 | 160 | } else { | 162 | } else { |
901 | 161 | DEBUG ("indicator is NULL, nothing to remove"); | 163 | DEBUG ("indicator is NULL, nothing to remove"); |
902 | 162 | } | 164 | } |
904 | 163 | @@ -1959,6 +1996,11 @@ | 165 | @@ -1980,6 +2017,11 @@ |
905 | 164 | priv->chat_manager = NULL; | 166 | priv->chat_manager = NULL; |
906 | 165 | } | 167 | } |
907 | 166 | 168 | ||
908 | @@ -172,7 +174,7 @@ | |||
909 | 172 | chat_windows = g_list_remove (chat_windows, window); | 174 | chat_windows = g_list_remove (chat_windows, window); |
910 | 173 | gtk_widget_destroy (priv->dialog); | 175 | gtk_widget_destroy (priv->dialog); |
911 | 174 | 176 | ||
913 | 175 | @@ -2057,6 +2099,9 @@ | 177 | @@ -2078,6 +2120,9 @@ |
914 | 176 | priv->indicators = g_hash_table_new_full (g_direct_hash, g_direct_equal, | 178 | priv->indicators = g_hash_table_new_full (g_direct_hash, g_direct_equal, |
915 | 177 | NULL, g_object_unref); | 179 | NULL, g_object_unref); |
916 | 178 | #endif | 180 | #endif |
917 | @@ -182,10 +184,10 @@ | |||
918 | 182 | 184 | ||
919 | 183 | priv->notebook = gtk_notebook_new (); | 185 | priv->notebook = gtk_notebook_new (); |
920 | 184 | gtk_notebook_set_group (GTK_NOTEBOOK (priv->notebook), "EmpathyChatWindow"); | 186 | gtk_notebook_set_group (GTK_NOTEBOOK (priv->notebook), "EmpathyChatWindow"); |
925 | 185 | 187 | Index: empathy-2.34.0/src/empathy-indicator-manager.c | |
926 | 186 | === modified file 'src/empathy-indicator-manager.c' | 188 | =================================================================== |
927 | 187 | --- old/src/empathy-indicator-manager.c 2011-02-24 17:06:45 +0000 | 189 | --- empathy-2.34.0.orig/src/empathy-indicator-manager.c 2011-03-24 13:00:46.878546910 -0400 |
928 | 188 | +++ new/src/empathy-indicator-manager.c 2011-02-24 17:09:26 +0000 | 190 | +++ empathy-2.34.0/src/empathy-indicator-manager.c 2011-03-24 13:00:50.978546908 -0400 |
929 | 189 | @@ -45,6 +45,10 @@ | 191 | @@ -45,6 +45,10 @@ |
930 | 190 | #define DEBUG_FLAG EMPATHY_DEBUG_OTHER | 192 | #define DEBUG_FLAG EMPATHY_DEBUG_OTHER |
931 | 191 | #include <libempathy/empathy-debug.h> | 193 | #include <libempathy/empathy-debug.h> |
932 | @@ -207,7 +209,7 @@ | |||
933 | 207 | } EmpathyIndicatorManagerPriv; | 209 | } EmpathyIndicatorManagerPriv; |
934 | 208 | 210 | ||
935 | 209 | typedef struct { | 211 | typedef struct { |
937 | 210 | @@ -172,6 +179,20 @@ | 212 | @@ -174,6 +181,20 @@ |
938 | 211 | g_object_unref (indicator); | 213 | g_object_unref (indicator); |
939 | 212 | priv->indicator_events = g_slist_prepend (priv->indicator_events, | 214 | priv->indicator_events = g_slist_prepend (priv->indicator_events, |
940 | 213 | indicator_event); | 215 | indicator_event); |
941 | @@ -228,7 +230,7 @@ | |||
942 | 228 | } | 230 | } |
943 | 229 | 231 | ||
944 | 230 | static void | 232 | static void |
946 | 231 | @@ -195,6 +216,26 @@ | 233 | @@ -197,6 +218,26 @@ |
947 | 232 | priv->indicator_events = g_slist_remove (priv->indicator_events, | 234 | priv->indicator_events = g_slist_remove (priv->indicator_events, |
948 | 233 | indicator_event); | 235 | indicator_event); |
949 | 234 | empathy_indicator_hide (indicator_event->indicator); | 236 | empathy_indicator_hide (indicator_event->indicator); |
950 | @@ -255,7 +257,7 @@ | |||
951 | 255 | return; | 257 | return; |
952 | 256 | } | 258 | } |
953 | 257 | } | 259 | } |
955 | 258 | @@ -211,6 +252,8 @@ | 260 | @@ -213,6 +254,8 @@ |
956 | 259 | 261 | ||
957 | 260 | priv = GET_PRIV (manager); | 262 | priv = GET_PRIV (manager); |
958 | 261 | 263 | ||
959 | @@ -264,7 +266,7 @@ | |||
960 | 264 | for (l = priv->indicator_events; l; l = l->next) | 266 | for (l = priv->indicator_events; l; l = l->next) |
961 | 265 | { | 267 | { |
962 | 266 | IndicatorEvent *indicator_event; | 268 | IndicatorEvent *indicator_event; |
964 | 267 | @@ -305,6 +348,10 @@ | 269 | @@ -307,6 +350,10 @@ |
965 | 268 | g_object_unref (priv->indicate_server); | 270 | g_object_unref (priv->indicate_server); |
966 | 269 | priv->indicate_server = NULL; | 271 | priv->indicate_server = NULL; |
967 | 270 | } | 272 | } |
968 | @@ -275,7 +277,7 @@ | |||
969 | 275 | if (priv->login_timeouts) { | 277 | if (priv->login_timeouts) { |
970 | 276 | g_hash_table_unref (priv->login_timeouts); | 278 | g_hash_table_unref (priv->login_timeouts); |
971 | 277 | priv->login_timeouts = NULL; | 279 | priv->login_timeouts = NULL; |
973 | 278 | @@ -379,6 +426,10 @@ | 280 | @@ -381,6 +428,10 @@ |
974 | 279 | G_CALLBACK (indicate_server_activate), | 281 | G_CALLBACK (indicate_server_activate), |
975 | 280 | manager); | 282 | manager); |
976 | 281 | 283 | ||
977 | @@ -286,4 +288,3 @@ | |||
978 | 286 | g_signal_connect (priv->event_manager, "event-added", | 288 | g_signal_connect (priv->event_manager, "event-added", |
979 | 287 | G_CALLBACK (indicator_manager_event_added_cb), | 289 | G_CALLBACK (indicator_manager_event_added_cb), |
980 | 288 | manager); | 290 | manager); |
981 | 289 | |||
982 | 290 | 291 | ||
983 | === removed file 'debian/patches/42_dont_change_menu_on_focus.patch' | |||
984 | --- debian/patches/42_dont_change_menu_on_focus.patch 2011-03-16 13:09:04 +0000 | |||
985 | +++ debian/patches/42_dont_change_menu_on_focus.patch 1970-01-01 00:00:00 +0000 | |||
986 | @@ -1,94 +0,0 @@ | |||
987 | 1 | Index: empathy-2.33.3/src/empathy-chat-window.c | ||
988 | 2 | =================================================================== | ||
989 | 3 | --- empathy-2.33.3.orig/src/empathy-chat-window.c 2011-03-15 16:04:12.372818869 -0400 | ||
990 | 4 | +++ empathy-2.33.3/src/empathy-chat-window.c 2011-03-15 16:08:00.452818868 -0400 | ||
991 | 5 | @@ -163,7 +163,7 @@ | ||
992 | 6 | { "text/uri-list", 0, DND_DRAG_TYPE_URI_LIST }, | ||
993 | 7 | }; | ||
994 | 8 | |||
995 | 9 | -static void chat_window_update (EmpathyChatWindow *window); | ||
996 | 10 | +static void chat_window_update (EmpathyChatWindow *window, gboolean via_focus_in); | ||
997 | 11 | |||
998 | 12 | G_DEFINE_TYPE (EmpathyChatWindow, empathy_chat_window, G_TYPE_OBJECT); | ||
999 | 13 | |||
1000 | 14 | @@ -354,7 +354,7 @@ | ||
1001 | 15 | g_signal_handlers_disconnect_by_func (object, | ||
1002 | 16 | _submenu_notify_visible_changed_cb, | ||
1003 | 17 | userdata); | ||
1004 | 18 | - chat_window_update (EMPATHY_CHAT_WINDOW (userdata)); | ||
1005 | 19 | + chat_window_update (EMPATHY_CHAT_WINDOW (userdata), FALSE); | ||
1006 | 20 | } | ||
1007 | 21 | |||
1008 | 22 | static void | ||
1009 | 23 | @@ -587,7 +587,8 @@ | ||
1010 | 24 | } | ||
1011 | 25 | |||
1012 | 26 | static void | ||
1013 | 27 | -chat_window_update (EmpathyChatWindow *window) | ||
1014 | 28 | +chat_window_update (EmpathyChatWindow *window, | ||
1015 | 29 | + gboolean via_focus_in) | ||
1016 | 30 | { | ||
1017 | 31 | EmpathyChatWindowPriv *priv = GET_PRIV (window); | ||
1018 | 32 | gint num_pages; | ||
1019 | 33 | @@ -600,8 +601,12 @@ | ||
1020 | 34 | |||
1021 | 35 | chat_window_conversation_menu_update (priv, window); | ||
1022 | 36 | |||
1023 | 37 | - chat_window_contact_menu_update (priv, | ||
1024 | 38 | - window); | ||
1025 | 39 | + /* We know menu will be same as when we left it and we may confuse | ||
1026 | 40 | + any global menu watching. */ | ||
1027 | 41 | + if (!via_focus_in) { | ||
1028 | 42 | + chat_window_contact_menu_update (priv, | ||
1029 | 43 | + window); | ||
1030 | 44 | + } | ||
1031 | 45 | |||
1032 | 46 | chat_window_title_update (priv); | ||
1033 | 47 | |||
1034 | 48 | @@ -629,7 +634,8 @@ | ||
1035 | 49 | } | ||
1036 | 50 | |||
1037 | 51 | static void | ||
1038 | 52 | -chat_window_update_chat_tab (EmpathyChat *chat) | ||
1039 | 53 | +chat_window_update_chat_tab_full (EmpathyChat *chat, | ||
1040 | 54 | + gboolean via_focus_in) | ||
1041 | 55 | { | ||
1042 | 56 | EmpathyChatWindow *window; | ||
1043 | 57 | EmpathyChatWindowPriv *priv; | ||
1044 | 58 | @@ -733,11 +739,17 @@ | ||
1045 | 59 | |||
1046 | 60 | /* Update the window if it's the current chat */ | ||
1047 | 61 | if (priv->current_chat == chat) { | ||
1048 | 62 | - chat_window_update (window); | ||
1049 | 63 | + chat_window_update (window, via_focus_in); | ||
1050 | 64 | } | ||
1051 | 65 | } | ||
1052 | 66 | |||
1053 | 67 | static void | ||
1054 | 68 | +chat_window_update_chat_tab (EmpathyChat *chat) | ||
1055 | 69 | +{ | ||
1056 | 70 | + chat_window_update_chat_tab_full (chat, FALSE); | ||
1057 | 71 | +} | ||
1058 | 72 | + | ||
1059 | 73 | +static void | ||
1060 | 74 | chat_window_chat_notify_cb (EmpathyChat *chat) | ||
1061 | 75 | { | ||
1062 | 76 | EmpathyContact *old_remote_contact; | ||
1063 | 77 | @@ -1719,7 +1731,7 @@ | ||
1064 | 78 | if (priv->chats == NULL) { | ||
1065 | 79 | g_object_unref (window); | ||
1066 | 80 | } else { | ||
1067 | 81 | - chat_window_update (window); | ||
1068 | 82 | + chat_window_update (window, FALSE); | ||
1069 | 83 | } | ||
1070 | 84 | } | ||
1071 | 85 | |||
1072 | 86 | @@ -1738,7 +1750,7 @@ | ||
1073 | 87 | chat_window_set_urgency_hint (window, FALSE); | ||
1074 | 88 | |||
1075 | 89 | /* Update the title, since we now mark all unread messages as read. */ | ||
1076 | 90 | - chat_window_update_chat_tab (priv->current_chat); | ||
1077 | 91 | + chat_window_update_chat_tab_full (priv->current_chat, TRUE); | ||
1078 | 92 | |||
1079 | 93 | #ifdef HAVE_LIBINDICATE | ||
1080 | 94 | /* Remove the indicator for the active chat */ | ||
1081 | 95 | 0 | ||
1082 | === modified file 'debian/patches/series' | |||
1083 | --- debian/patches/series 2011-03-16 13:09:04 +0000 | |||
1084 | +++ debian/patches/series 2011-03-24 17:26:45 +0000 | |||
1085 | @@ -12,4 +12,3 @@ | |||
1086 | 12 | 38_lp_569289.patch | 12 | 38_lp_569289.patch |
1087 | 13 | 40_unity_launcher_count.patch | 13 | 40_unity_launcher_count.patch |
1088 | 14 | 41_unity_launcher_progress.patch | 14 | 41_unity_launcher_progress.patch |
1089 | 15 | 42_dont_change_menu_on_focus.patch |
Thanks for this request, but we are past feature freeze. If you think this should go in Natty, you should file a bug and request a Feature Freeze exception:
https:/ /wiki.ubuntu. com/FreezeExcep tionProcess
Thanks!