1 |
swegener 07/10/01 19:39:08 |
2 |
|
3 |
Added: superswitcher-0.5-gtk-2.11.0.patch |
4 |
Log: |
5 |
Add patch based on upstream subversion commit to compile with gtk >= 2.11.0, bug #190489. |
6 |
(Portage version: 2.1.3.11) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 x11-misc/superswitcher/files/superswitcher-0.5-gtk-2.11.0.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/superswitcher/files/superswitcher-0.5-gtk-2.11.0.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/superswitcher/files/superswitcher-0.5-gtk-2.11.0.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: superswitcher-0.5-gtk-2.11.0.patch |
15 |
=================================================================== |
16 |
This patch is based on upstream Subversion commit 28, modified to use |
17 |
GTK_CHECK_VERSION to avoid patching configure.in. |
18 |
|
19 |
--- superswitcher/src/popup.c |
20 |
+++ superswitcher/src/popup.c |
21 |
@@ -682,8 +682,12 @@ |
22 |
gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE); |
23 |
image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_MENU); |
24 |
gtk_container_add (GTK_CONTAINER (button), image); |
25 |
+#if GTK_CHECK_VERSION(2, 11, 0) |
26 |
+ gtk_widget_set_tooltip_text (GTK_WIDGET (button), tooltip); |
27 |
+#else |
28 |
gtk_tooltips_set_tip (GTK_TOOLTIPS (popup->screen->tooltips), |
29 |
button, tooltip, ""); |
30 |
+#endif |
31 |
g_signal_connect (G_OBJECT (button), "clicked", callback, popup); |
32 |
|
33 |
return button; |
34 |
--- superswitcher/src/screen.c |
35 |
+++ superswitcher/src/screen.c |
36 |
@@ -906,7 +906,9 @@ |
37 |
screen->label_max_width_chars = 256; |
38 |
update_window_label_width (screen); |
39 |
|
40 |
+#if !GTK_CHECK_VERSION(2, 11, 0) |
41 |
screen->tooltips = gtk_tooltips_new (); |
42 |
+#endif |
43 |
|
44 |
screen->pointer_needs_recentering_on_focus_change = FALSE; |
45 |
#ifdef HAVE_GCONF |
46 |
--- superswitcher/src/screen.h |
47 |
+++ superswitcher/src/screen.h |
48 |
@@ -47,7 +47,9 @@ |
49 |
|
50 |
int label_max_width_chars; |
51 |
|
52 |
+#if !GTK_CHECK_VERSION(2, 11, 0) |
53 |
GtkTooltips * tooltips; |
54 |
+#endif |
55 |
|
56 |
gboolean pointer_needs_recentering_on_focus_change; |
57 |
}; |
58 |
--- superswitcher/src/window.c |
59 |
+++ superswitcher/src/window.c |
60 |
@@ -215,8 +215,12 @@ |
61 |
window = (SSWindow *) data; |
62 |
gtk_label_set_text (GTK_LABEL (window->label), |
63 |
wnck_window_get_name (window->wnck_window)); |
64 |
+#if GTK_CHECK_VERSION(2, 11, 0) |
65 |
+ gtk_widget_set_tooltip_text (window->widget, wnck_window_get_name (wnck_window)); |
66 |
+#else |
67 |
gtk_tooltips_set_tip (GTK_TOOLTIPS (window->workspace->screen->tooltips), |
68 |
window->widget, wnck_window_get_name (wnck_window), ""); |
69 |
+#endif |
70 |
gtk_widget_queue_draw (gtk_widget_get_toplevel (window->widget)); |
71 |
} |
72 |
|
73 |
@@ -301,8 +305,12 @@ |
74 |
|
75 |
eventbox = gtk_event_box_new (); |
76 |
gtk_event_box_set_visible_window (GTK_EVENT_BOX (eventbox), FALSE); |
77 |
+#if GTK_CHECK_VERSION(2, 11, 0) |
78 |
+ gtk_widget_set_tooltip_text (eventbox, wnck_window_get_name (wnck_window)); |
79 |
+#else |
80 |
gtk_tooltips_set_tip (GTK_TOOLTIPS (workspace->screen->tooltips), |
81 |
eventbox, wnck_window_get_name (wnck_window), ""); |
82 |
+#endif |
83 |
|
84 |
hbox = gtk_hbox_new (FALSE, 3); |
85 |
gtk_container_add (GTK_CONTAINER (eventbox), hbox); |
86 |
|
87 |
|
88 |
|
89 |
-- |
90 |
gentoo-commits@g.o mailing list |