Gentoo Archives: gentoo-commits

From: "Thomas Beierlein (tomjbe)" <tomjbe@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-radio/xdx/files: xdx-gtk-2.20.patch
Date: Sat, 03 Jul 2010 12:28:02
Message-Id: 20100703121149.6733A2CF3E@corvid.gentoo.org
1 tomjbe 10/07/03 12:11:49
2
3 Added: xdx-gtk-2.20.patch
4 Log:
5 Fix for deprecated macro in GTK+-2.20 and later (bug #326627). Thanks Diego and Kevin.
6 (Portage version: 2.1.8.3/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 media-radio/xdx/files/xdx-gtk-2.20.patch
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-radio/xdx/files/xdx-gtk-2.20.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-radio/xdx/files/xdx-gtk-2.20.patch?rev=1.1&content-type=text/plain
13
14 Index: xdx-gtk-2.20.patch
15 ===================================================================
16 # fix for bug #326627 deprecated macro from gtk+-2.20 on
17 diff -Nur xdx-2.4.2.orig//src/gui.c xdx-2.4.2//src/gui.c
18 --- xdx-2.4.2.orig//src/gui.c 2010-07-03 11:09:59.000000000 +0000
19 +++ xdx-2.4.2//src/gui.c 2010-07-03 11:10:45.000000000 +0000
20 @@ -841,7 +841,7 @@
21 GtkWidget *mainentry;
22
23 mainentry = g_object_get_data (G_OBJECT (gui->window), "mainentry");
24 - if (GTK_WIDGET_HAS_FOCUS(mainentry))
25 + if (gtk_widget_has_focus(mainentry))
26 {
27 switch (event->keyval)
28 {
29 diff -Nur xdx-2.4.2.orig//src/text.c xdx-2.4.2//src/text.c
30 --- xdx-2.4.2.orig//src/text.c 2010-07-03 11:09:59.000000000 +0000
31 +++ xdx-2.4.2//src/text.c 2010-07-03 11:11:16.000000000 +0000
32 @@ -528,7 +528,7 @@
33
34
35 /* focusing the treeview will stop scrolling */
36 - if (!GTK_WIDGET_HAS_FOCUS(treeview))
37 + if (!gtk_widget_has_focus(treeview))
38 {
39 path = gtk_tree_model_get_path (GTK_TREE_MODEL (model), &iter);
40 gtk_tree_view_set_cursor (GTK_TREE_VIEW (treeview), path, NULL, FALSE);
41 @@ -797,7 +797,7 @@
42 }
43 }
44 /* focusing (clicking) the textview will stop scrolling */
45 - if (!GTK_WIDGET_HAS_FOCUS(maintext))
46 + if (!gtk_widget_has_focus(maintext))
47 {
48 gtk_text_buffer_get_bounds (buffer, &start, &end);
49 gtk_text_buffer_place_cursor(buffer, &end);