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