1 |
nirbheek 09/03/21 18:39:36 |
2 |
|
3 |
Added: gnome-control-center-2.24.0.1-hv-max.patch |
4 |
gnome-control-center-2.24.0.1-capplet-help.patch |
5 |
Log: |
6 |
Add patches to gnome-control-center-2.24.0.2-r1 for fixing bug 263166 and bug 263168 |
7 |
(Portage version: 2.2_rc26/cvs/Linux i686) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 gnome-base/gnome-control-center/files/gnome-control-center-2.24.0.1-hv-max.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gnome-control-center/files/gnome-control-center-2.24.0.1-hv-max.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gnome-control-center/files/gnome-control-center-2.24.0.1-hv-max.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: gnome-control-center-2.24.0.1-hv-max.patch |
16 |
=================================================================== |
17 |
diff -up gnome-control-center-2.24.0.1/libwindow-settings/metacity-window-manager.c.hv-max gnome-control-center-2.24.0.1/libwindow-settings/metacity-window-manager.c |
18 |
--- gnome-control-center-2.24.0.1/libwindow-settings/metacity-window-manager.c.hv-max 2008-10-04 02:01:24.000000000 -0400 |
19 |
+++ gnome-control-center-2.24.0.1/libwindow-settings/metacity-window-manager.c 2008-10-04 02:02:53.000000000 -0400 |
20 |
@@ -214,10 +214,10 @@ metacity_change_settings (GnomeWindowMan |
21 |
action = "toggle_maximize"; |
22 |
break; |
23 |
case DOUBLE_CLICK_MAXIMIZE_VERTICALLY: |
24 |
- action = "toggle_maximize_vert"; |
25 |
+ action = "toggle_maximize_vertically"; |
26 |
break; |
27 |
case DOUBLE_CLICK_MAXIMIZE_HORIZONTALLY: |
28 |
- action = "toggle_maximize_horiz"; |
29 |
+ action = "toggle_maximize_horizontally"; |
30 |
break; |
31 |
case DOUBLE_CLICK_MINIMIZE: |
32 |
action = "minimize"; |
33 |
@@ -370,9 +370,11 @@ metacity_get_settings (GnomeWindowManage |
34 |
settings->double_click_action = DOUBLE_CLICK_SHADE; |
35 |
else if (strcmp (str, "toggle_maximize") == 0) |
36 |
settings->double_click_action = DOUBLE_CLICK_MAXIMIZE; |
37 |
- else if (strcmp (str, "toggle_maximize_horiz") == 0) |
38 |
+ else if (strcmp (str, "toggle_maximize_horizontally") == 0 || |
39 |
+ strcmp (str, "toggle_maximize_horiz") == 0) |
40 |
settings->double_click_action = DOUBLE_CLICK_MAXIMIZE_HORIZONTALLY; |
41 |
- else if (strcmp (str, "toggle_maximize_vert") == 0) |
42 |
+ else if (strcmp (str, "toggle_maximize_vertically") == 0 || |
43 |
+ strcmp (str, "toggle_maximize_vert") == 0) |
44 |
settings->double_click_action = DOUBLE_CLICK_MAXIMIZE_VERTICALLY; |
45 |
else if (strcmp (str, "minimize") == 0) |
46 |
settings->double_click_action = DOUBLE_CLICK_MINIMIZE; |
47 |
|
48 |
|
49 |
|
50 |
1.1 gnome-base/gnome-control-center/files/gnome-control-center-2.24.0.1-capplet-help.patch |
51 |
|
52 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gnome-control-center/files/gnome-control-center-2.24.0.1-capplet-help.patch?rev=1.1&view=markup |
53 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gnome-control-center/files/gnome-control-center-2.24.0.1-capplet-help.patch?rev=1.1&content-type=text/plain |
54 |
|
55 |
Index: gnome-control-center-2.24.0.1-capplet-help.patch |
56 |
=================================================================== |
57 |
diff -up gnome-control-center-2.24.0.1/capplets/appearance/appearance-main.c.capplet-help gnome-control-center-2.24.0.1/capplets/appearance/appearance-main.c |
58 |
--- gnome-control-center-2.24.0.1/capplets/appearance/appearance-main.c.capplet-help 2008-10-04 01:40:15.000000000 -0400 |
59 |
+++ gnome-control-center-2.24.0.1/capplets/appearance/appearance-main.c 2008-10-04 01:40:34.000000000 -0400 |
60 |
@@ -85,6 +85,38 @@ main_window_response (GtkWidget *widget, |
61 |
g_object_unref (data->client); |
62 |
g_object_unref (data->xml); |
63 |
} |
64 |
+ else if (response_id == GTK_RESPONSE_HELP) |
65 |
+ { |
66 |
+ GtkNotebook *nb; |
67 |
+ gint pindex; |
68 |
+ |
69 |
+ nb = GTK_NOTEBOOK (glade_xml_get_widget (data->xml, "main_notebook")); |
70 |
+ pindex = gtk_notebook_get_current_page (nb); |
71 |
+ |
72 |
+ switch (pindex) |
73 |
+ { |
74 |
+ case 0: /* theme */ |
75 |
+ capplet_help (GTK_WINDOW (widget), "user-guide.xml", |
76 |
+ "goscustdesk-12"); |
77 |
+ break; |
78 |
+ case 1: /* background */ |
79 |
+ capplet_help (GTK_WINDOW (widget), "user-guide.xml", |
80 |
+ "goscustdesk-7"); |
81 |
+ break; |
82 |
+ case 2: /* fonts */ |
83 |
+ capplet_help (GTK_WINDOW (widget), "user-guide.xml", |
84 |
+ "goscustdesk-38"); |
85 |
+ break; |
86 |
+ case 3: /* interface */ |
87 |
+ capplet_help (GTK_WINDOW (widget), "user-guide.xml", |
88 |
+ "goscustuserinter-2"); |
89 |
+ break; |
90 |
+ default: |
91 |
+ capplet_help (GTK_WINDOW (widget), "user-guide.xml", |
92 |
+ "prefs-look-and-feel"); |
93 |
+ break; |
94 |
+ } |
95 |
+ } |
96 |
} |
97 |
|
98 |
int |
99 |
diff -up gnome-control-center-2.24.0.1/capplets/appearance/appearance-style.c.capplet-help gnome-control-center-2.24.0.1/capplets/appearance/appearance-style.c |
100 |
--- gnome-control-center-2.24.0.1/capplets/appearance/appearance-style.c.capplet-help 2008-10-04 01:40:24.000000000 -0400 |
101 |
+++ gnome-control-center-2.24.0.1/capplets/appearance/appearance-style.c 2008-10-04 01:40:34.000000000 -0400 |
102 |
@@ -392,7 +392,7 @@ static void |
103 |
style_response_cb (GtkDialog *dialog, gint response_id) |
104 |
{ |
105 |
if (response_id == GTK_RESPONSE_HELP) { |
106 |
- /* FIXME: help */ |
107 |
+ capplet_help (GTK_WINDOW (dialog), "user-guide.xml", "goscustdesk-61"); |
108 |
} else { |
109 |
gtk_widget_hide (GTK_WIDGET (dialog)); |
110 |
} |