After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 630107 - update Empathy to deprecation changes in GTK+ 2.22
update Empathy to deprecation changes in GTK+ 2.22
Status: RESOLVED FIXED
Product: empathy
Classification: Core
Component: General
unspecified
Other All
: Normal normal
: ---
Assigned To: empathy-maint
empathy-maint
: 630241 630243 (view as bug list)
Depends on:
Blocks: 630025
 
 
Reported: 2010-09-19 23:14 UTC by Diego Escalante Urrelo (not reading bugmail)
Modified: 2011-08-29 10:12 UTC
See Also:
GNOME target: 3.0
GNOME version: ---

Attachments
empathy-avatar-image: don't use gdk_display global (1.07 KB, patch)
2010-09-19 23:14 UTC, Diego Escalante Urrelo (not reading bugmail) 		accepted-commit_after_freeze Details | Review
Don't use deprecated gtk_dialog_set_has_separator (8.88 KB, patch)
2010-09-19 23:14 UTC, Diego Escalante Urrelo (not reading bugmail) 		accepted-commit_after_freeze Details | Review
empathy-chat: update GDK_ defines to GDK_KEY_ (2.83 KB, patch)
2010-09-19 23:14 UTC, Diego Escalante Urrelo (not reading bugmail) 		accepted-commit_after_freeze Details | Review

Description Diego Escalante Urrelo (not reading bugmail) 2010-09-19 23:14:01 UTC 
The attached patches make Empathy build fine with GTK+ 2.21.8 (what I have installed here, likely it works in anything newer).

Notice that the three of them should be compatible with GTK+ 3.0.
Comment 1 Diego Escalante Urrelo (not reading bugmail) 2010-09-19 23:14:05 UTC 
Created attachment 170609 [details] [review]
empathy-avatar-image: don't use gdk_display global

This is deprecated for GTK+ 2.22.

Bug #630107
Comment 2 Diego Escalante Urrelo (not reading bugmail) 2010-09-19 23:14:09 UTC 
Created attachment 170610 [details] [review]
Don't use deprecated gtk_dialog_set_has_separator

This is deprecated in GTK+ 2.22

Bug #630107
Comment 3 Diego Escalante Urrelo (not reading bugmail) 2010-09-19 23:14:13 UTC 
Created attachment 170611 [details] [review]
empathy-chat: update GDK_ defines to GDK_KEY_

This change works in both GTK+ 2.22 and GTK+ 3.0

Bug #630107
Comment 4 Philip Withnall 2010-09-20 09:28:31 UTC 
Review of attachment 170610 [details] [review]:

Looks good, thanks!
Comment 5 Guillaume Desmottes 2010-09-20 09:33:12 UTC 
Your patches looks good to us, thanks! The only issue is that it bumps the GTK+ dep to 2.21.8 and we are in hard code freeze.
We have 3 options here:

a) Get the approval of the release team and merge it for 2.32.0
b) Wait until the 2.32.0 release and merge it for 2.32.1 (post hard code freeze)
c) Defer until we branch and fix it only for 3.0

Even if we don't build with deprecated disabled in releases, I'd still like to get it fixed in 2.32 (if only to make my life easier once I'll upgrade my GTK+) so I'd vote for a) or b).
Comment 6 Guillaume Desmottes 2010-09-20 09:34:15 UTC 
For the record, I pushed a branch containing your patches and the dep bump:
http://git.Collabora.co.uk/?p=user/cassidy/empathy;a=shortlog;h=refs/heads/gtk-2-630107
Comment 7 Guillaume Desmottes 2010-09-21 11:01:53 UTC 
*** Bug 630241 has been marked as a duplicate of this bug. ***
Comment 8 André Klapper 2010-09-21 11:13:28 UTC 
*** Bug 630243 has been marked as a duplicate of this bug. ***
Comment 9 Guillaume Desmottes 2010-09-21 11:30:22 UTC 
André: what's the best option in your opinion?
Comment 10 Guillaume Desmottes 2010-09-24 14:37:34 UTC 
(In reply to comment #5)
> Even if we don't build with deprecated disabled in releases, I'd still like to
> get it fixed in 2.32 

Humm, actually it's more than deprecation warning, we should get if fix for 2.32.0 then.
Comment 11 Guillaume Desmottes 2010-09-28 08:34:59 UTC 
Merged for 2.32.1

This problem has been fixed in our software repository. The fix will go into the next software release. Thank you for your bug report.