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 571868 - GNOME Goal: Remove deprecated GTK+ symbols
GNOME Goal: Remove deprecated GTK+ symbols
Status: RESOLVED FIXED
Product: yelp
Classification: Applications
Component: General
git master
Other Linux
: Normal normal
: ---
Assigned To: Yelp maintainers
Yelp maintainers
Depends on: 572273
Blocks: 585692
 
 
Reported: 2009-02-15 19:35 UTC by André Klapper
Modified: 2009-07-20 11:38 UTC
See Also:
GNOME target: ---
GNOME version: ---


Attachments
Replaces deprecated gtk symbols (2.85 KB, patch)
2009-02-23 22:29 UTC, Thomas Andersen
committed Details | Review
Replace deprecated gtk_action_connect_proxy (1.05 KB, patch)
2009-04-09 00:13 UTC, Thomas Andersen
none Details | Review
571868 (1.54 KB, patch)
2009-04-26 22:51 UTC, Thomas Andersen
none Details | Review
same patch but uses #if GTK_CHECK_VERSION (2, 16, 0) (1.28 KB, patch)
2009-04-29 23:13 UTC, Thomas Andersen
committed Details | Review

Description André Klapper 2009-02-15 19:35:57 UTC
See http://live.gnome.org/GnomeGoals/RemoveDeprecatedSymbols/GTK%2B .

./src/yelp-search-pager.c:1675:	    gtk_idle_add_priority (G_PRIORITY_LOW,
./src/yelp-settings.c:779:	gtk_object_sink (GTK_OBJECT (widget));
./src/yelp-toc-pager.c:279:	    gtk_idle_add_priority (G_PRIORITY_LOW,
./src/yelp-toc-pager.c:332:	    gtk_idle_add_priority (G_PRIORITY_LOW,
./src/yelp-pager.c:291:    priv->process_id = gtk_idle_add ((GSourceFunc) process_cb, pager);
./src/yelp-html.h:33:#define YELP_HTML(o)           (GTK_CHECK_CAST ((o), YELP_TYPE_HTML, YelpHtml))
./src/yelp-html.h:35:#define YELP_IS_HTML(o)        (GTK_CHECK_TYPE ((o), YELP_TYPE_HTML))
./src/yelp-html.h:36:#define YELP_IS_HTML_CLASS(k)  (GTK_CHECK_CLASS_TYPE ((k), YELP_TYPE_HTML))
./src/yelp-base.c:110:	parent_class = gtk_type_class (PARENT_TYPE);
./src/yelp-window.h:34: #define YELP_WINDOW(obj)		(GTK_CHECK_CAST ((obj), YELP_TYPE_WINDOW, YelpWindow))
./src/yelp-window.h:35: #define YELP_WINDOW_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), YELP_TYPE_WINDOW, YelpWindowClass))
./src/yelp-window.h:36: #define YELP_IS_WINDOW(obj)		(GTK_CHECK_TYPE ((obj), YELP_TYPE_WINDOW))
./src/yelp-window.h:37: #define YELP_IS_WINDOW_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), YELP_TYPE_WINDOW))
Comment 1 Thomas Andersen 2009-02-23 22:29:50 UTC
Created attachment 129375 [details] [review]
Replaces deprecated gtk symbols

Patch replaces various deprecated gtk symbols.

Things to note:
1) the reference to GTK_CHECK_FOR_CAST in YELP_HTML_CLASS was bogus. I assumed it was meant to be GTK_CHECK_CLASS_CAST. Since it is not used anywhere it makes little difference.

2) Still todo is gtk_action_connect_proxy that was deprecated in gtk 2.16

3) there is still deprecated gtk and glib in unused/dead files:
yelp-db-pager.c
yelp-db-pager.h
yelp-db-print-pager.c
yelp-db-print-pager.h
yelp-info-pager.c
yelp-info-pager.h
yelp-man-pager.c
yelp-man-pager.h
yelp-pager.c
yelp-pager.h
yelp-search-pager.c
yelp-search-pager.h
yelp-toc-pager.c
yelp-toc-pager.h
yelp-xslt-pager.c
yelp-xslt-pager.h
info2html/
man2html/

Could these be deleted?
Comment 2 André Klapper 2009-02-23 22:33:44 UTC
phomes: Yupp, it is planned to delete these directories - see bug 560451.
CC'ing Shaun as this is another nice cleanup for Yelp.
Comment 3 André Klapper 2009-02-25 18:45:46 UTC
Thomas: Just go ahead and commit if it's safe (that's what Shaun said on irc)
Comment 4 Thomas Andersen 2009-02-25 19:07:59 UTC
I personally consider the patch to be pretty safe. My tests did not show any problems either.

Should I delete the unused files I listed in the same go?
Comment 5 Thomas Andersen 2009-02-25 23:06:20 UTC
I committed the patch as r3221:
http://svn.gnome.org/viewvc/yelp?view=revision&revision=3221

I'm leaving the bug open for:
- gtk_action_connect_proxy
- symbols in unused files
Comment 6 Thomas Andersen 2009-04-09 00:13:16 UTC
Created attachment 132373 [details] [review]
Replace deprecated gtk_action_connect_proxy

Patch replaces the last use of deprecated gtk symbols. It replaces gtk_action_connect_proxy with gtk_activatable_do_set_related_action. This needs gtk 2.16 so bumping the required gtk in configure.in too.

Also ping on deleting those unused/dead files listed earlier.

With these changes yelp should be free of both deprecated gtk and glib symbols
Comment 7 Shaun McCance 2009-04-09 04:28:40 UTC
I've removed the unused files.  Is there anything else other than the use of gtk_action_connect_proxy?  I'll have to update my development machine so I can build against GTK+ 2.16 before I commit that.
Comment 8 Thomas Andersen 2009-04-09 08:05:52 UTC
no, gtk_action_connect_proxy was the only thing I did not fix in the other patch due to the dep on gtk 2.16. With this patch yelp will be done for this goal.
Comment 9 Thomas Andersen 2009-04-26 22:51:20 UTC
Created attachment 133377 [details] [review]
571868

Same patch but created with git format-patch HEAD^ for convenience
Comment 10 Don Scorgie 2009-04-29 18:41:32 UTC
I'm happy for this to be committed, however doing so will block Shaun from dev work (until he updates GTK+).  Once he gives the signal (or prior to 2.27.1 release) I'll apply the patch.
Comment 11 Thomas Andersen 2009-04-29 23:13:21 UTC
Created attachment 133617 [details] [review]
same patch but uses #if GTK_CHECK_VERSION (2, 16, 0)

Same patch as before but this checks #if GTK_CHECK_VERSION (2, 16, 0) to only use the new api when gtk 2.16 is available.

This can be used until Shaun is ready and the #if-stuff can just be removed again when you are ready.
Comment 12 André Klapper 2009-05-27 20:34:55 UTC
Thomas: Just commit the last (#ifdef'ed patch) to master please.
People can still blame me afterwards. :)
Comment 13 Thomas Andersen 2009-05-28 13:51:20 UTC
I will probably not be able to do this until after June 8th :(
Comment 14 André Klapper 2009-06-13 14:46:06 UTC
git committed this to the webkit branch: http://git.gnome.org/cgit/yelp/commit/?h=webkit&id=4294bd05a1c8af1ff7c8d9d1fbead86d5d1c4c9a and rejected the commit to master.
No idea what is what for here. Is this enough to close this?
Comment 15 André Klapper 2009-07-13 18:32:27 UTC
So is fixing the webkit branch enough?
Comment 16 André Klapper 2009-07-19 23:25:21 UTC
<shaunm> andre: master is what I'm working on.  I don't believe I've ever made a commit to webkit
<shaunm> commits on webkit ought to be only for the purpose of switching to webkit

So here you go. :)
Comment 17 Thomas Andersen 2009-07-20 11:38:01 UTC
Committed to master:
http://git.gnome.org/cgit/yelp/commit/?id=796c2bcd915868796736d6ef1049e0f1d95127c4