Merge lp:~robert-ancell/unity-control-center/always-ubuntu-help into lp:unity-control-center

Proposed by Robert Ancell on 2016-03-09
Status: Merged
Approved by: Sebastien Bacher on 2016-03-15
Approved revision: 12854
Merged at revision: 12853
Proposed branch: lp:~robert-ancell/unity-control-center/always-ubuntu-help
Merge into: lp:unity-control-center
Diff against target: 287 lines (+21/-75)
16 files modified
panels/bluetooth/cc-bluetooth-panel.c (+1/-4)
panels/color/cc-color-panel.c (+1/-10)
panels/color/color.ui (+1/-1)
panels/display/cc-display-panel.c (+1/-4)
panels/keyboard/cc-keyboard-panel.c (+1/-1)
panels/mouse/cc-mouse-panel.c (+1/-4)
panels/network/cc-network-panel.c (+1/-4)
panels/power/cc-power-panel.c (+1/-4)
panels/printers/cc-printers-panel.c (+1/-4)
panels/region/cc-region-panel.c (+1/-1)
panels/screen/cc-screen-panel.c (+1/-4)
panels/universal-access/cc-ua-panel.c (+1/-4)
panels/user-accounts/um-password-dialog.c (+1/-6)
panels/user-accounts/um-user-panel.c (+1/-4)
panels/wacom/cc-wacom-panel.c (+1/-4)
shell/control-center.c (+6/-16)
To merge this branch: bzr merge lp:~robert-ancell/unity-control-center/always-ubuntu-help
Reviewer Review Type Date Requested Status
Sebastien Bacher 2016-03-09 Approve on 2016-03-15
Review via email: mp+288573@code.launchpad.net

Commit message

Always use Ubuntu help (remove hangover from g-c-c days).

To post a comment you must log in.
12853. By Robert Ancell on 2016-03-09

Drop unnecessary code

12854. By Robert Ancell on 2016-03-09

Drop unnecessary code

Sebastien Bacher (seb128) wrote :

great

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'panels/bluetooth/cc-bluetooth-panel.c'
2--- panels/bluetooth/cc-bluetooth-panel.c 2015-08-13 15:43:55 +0000
3+++ panels/bluetooth/cc-bluetooth-panel.c 2016-03-09 22:23:13 +0000
4@@ -77,10 +77,7 @@
5 static const char *
6 cc_bluetooth_panel_get_help_uri (CcPanel *panel)
7 {
8- if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))
9- return "help:ubuntu-help/bluetooth";
10- else
11- return "help:gnome-help/bluetooth";
12+ return "help:ubuntu-help/bluetooth";
13 }
14
15 static void
16
17=== modified file 'panels/color/cc-color-panel.c'
18--- panels/color/cc-color-panel.c 2014-02-18 03:09:04 +0000
19+++ panels/color/cc-color-panel.c 2016-03-09 22:23:13 +0000
20@@ -2390,10 +2390,7 @@
21 static const char *
22 cc_color_panel_get_help_uri (CcPanel *panel)
23 {
24- if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))
25- return "help:ubuntu-help/color";
26- else
27- return "help:gnome-help/color";
28+ return "help:ubuntu-help/color";
29 }
30
31 static void
32@@ -2675,12 +2672,6 @@
33 g_signal_connect (widget, "realize",
34 G_CALLBACK (gcm_prefs_window_realize_cb),
35 prefs);
36-
37- widget = WID (priv->builder, "linkbutton_help");
38- if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))
39- g_object_set (G_OBJECT (widget),
40- "uri", "help:ubuntu-help/color-whyimportant",
41- NULL);
42 }
43
44 void
45
46=== modified file 'panels/color/color.ui'
47--- panels/color/color.ui 2012-05-18 16:39:31 +0000
48+++ panels/color/color.ui 2016-03-09 22:23:13 +0000
49@@ -174,7 +174,7 @@
50 <property name="use_action_appearance">False</property>
51 <property name="relief">none</property>
52 <property name="xalign">0.50999999046325684</property>
53- <property name="uri">help:gnome-help/color-whyimportant</property>
54+ <property name="uri">help:ubuntu-help/color-whyimportant</property>
55 </object>
56 <packing>
57 <property name="expand">False</property>
58
59=== modified file 'panels/display/cc-display-panel.c'
60--- panels/display/cc-display-panel.c 2014-08-29 10:26:05 +0000
61+++ panels/display/cc-display-panel.c 2016-03-09 22:23:13 +0000
62@@ -226,10 +226,7 @@
63 static const char *
64 cc_display_panel_get_help_uri (CcPanel *panel)
65 {
66- if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))
67- return "help:ubuntu-help/prefs-display";
68- else
69- return "help:gnome-help/prefs-display";
70+ return "help:ubuntu-help/prefs-display";
71 }
72
73 static void
74
75=== modified file 'panels/keyboard/cc-keyboard-panel.c'
76--- panels/keyboard/cc-keyboard-panel.c 2012-11-03 14:37:42 +0000
77+++ panels/keyboard/cc-keyboard-panel.c 2016-03-09 22:23:13 +0000
78@@ -138,7 +138,7 @@
79 static const char *
80 cc_keyboard_panel_get_help_uri (CcPanel *panel)
81 {
82- return "help:gnome-help/keyboard";
83+ return "help:ubuntu-help/keyboard";
84 }
85
86 static void
87
88=== modified file 'panels/mouse/cc-mouse-panel.c'
89--- panels/mouse/cc-mouse-panel.c 2013-11-28 04:32:11 +0000
90+++ panels/mouse/cc-mouse-panel.c 2016-03-09 22:23:13 +0000
91@@ -107,10 +107,7 @@
92 static const char *
93 cc_mouse_panel_get_help_uri (CcPanel *panel)
94 {
95- if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))
96- return "help:ubuntu-help/mouse";
97- else
98- return "help:gnome-help/mouse";
99+ return "help:ubuntu-help/mouse";
100 }
101
102 static void
103
104=== modified file 'panels/network/cc-network-panel.c'
105--- panels/network/cc-network-panel.c 2015-09-15 17:00:16 +0000
106+++ panels/network/cc-network-panel.c 2016-03-09 22:23:13 +0000
107@@ -242,10 +242,7 @@
108 static const char *
109 cc_network_panel_get_help_uri (CcPanel *panel)
110 {
111- if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))
112- return "help:ubuntu-help/net";
113- else
114- return "help:gnome-help/net";
115+ return "help:ubuntu-help/net";
116 }
117
118 static void
119
120=== modified file 'panels/power/cc-power-panel.c'
121--- panels/power/cc-power-panel.c 2014-10-30 15:11:06 +0000
122+++ panels/power/cc-power-panel.c 2016-03-09 22:23:13 +0000
123@@ -168,10 +168,7 @@
124 static const char *
125 cc_power_panel_get_help_uri (CcPanel *panel)
126 {
127- if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))
128- return "help:ubuntu-help/power";
129- else
130- return "help:gnome-help/power";
131+ return "help:ubuntu-help/power";
132 }
133
134 static void
135
136=== modified file 'panels/printers/cc-printers-panel.c'
137--- panels/printers/cc-printers-panel.c 2014-02-18 03:09:04 +0000
138+++ panels/printers/cc-printers-panel.c 2016-03-09 22:23:13 +0000
139@@ -251,10 +251,7 @@
140 static const char *
141 cc_printers_panel_get_help_uri (CcPanel *panel)
142 {
143- if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))
144- return "help:ubuntu-help/printing";
145- else
146- return "help:gnome-help/printing";
147+ return "help:ubuntu-help/printing";
148 }
149
150 static void
151
152=== modified file 'panels/region/cc-region-panel.c'
153--- panels/region/cc-region-panel.c 2014-09-15 20:22:00 +0000
154+++ panels/region/cc-region-panel.c 2016-03-09 22:23:13 +0000
155@@ -142,7 +142,7 @@
156 static const char *
157 cc_region_panel_get_help_uri (CcPanel *panel)
158 {
159- return "help:gnome-help/prefs-language";
160+ return "help:ubuntu-help/prefs-language";
161 }
162
163 static void
164
165=== modified file 'panels/screen/cc-screen-panel.c'
166--- panels/screen/cc-screen-panel.c 2014-02-18 04:27:04 +0000
167+++ panels/screen/cc-screen-panel.c 2016-03-09 22:23:13 +0000
168@@ -148,10 +148,7 @@
169 static const char *
170 cc_screen_panel_get_help_uri (CcPanel *panel)
171 {
172- if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))
173- return "help:ubuntu-help/prefs-display";
174- else
175- return "help:gnome-help/prefs-display";
176+ return "help:ubuntu-help/prefs-display";
177 }
178
179 static void
180
181=== modified file 'panels/universal-access/cc-ua-panel.c'
182--- panels/universal-access/cc-ua-panel.c 2014-03-28 12:57:57 +0000
183+++ panels/universal-access/cc-ua-panel.c 2016-03-09 22:23:13 +0000
184@@ -173,10 +173,7 @@
185 static const char *
186 cc_ua_panel_get_help_uri (CcPanel *panel)
187 {
188- if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))
189- return "help:ubuntu-help/a11y";
190- else
191- return "help:gnome-help/a11y";
192+ return "help:ubuntu-help/a11y";
193 }
194
195 static void
196
197=== modified file 'panels/user-accounts/um-password-dialog.c'
198--- panels/user-accounts/um-password-dialog.c 2014-04-25 01:43:30 +0000
199+++ panels/user-accounts/um-password-dialog.c 2016-03-09 22:23:13 +0000
200@@ -621,14 +621,9 @@
201
202 widget = (GtkWidget *) gtk_builder_get_object (builder, "password-normal-strength-hints-label");
203 old_label = gtk_label_get_label (GTK_LABEL (widget));
204- if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))
205- label = g_strdup_printf ("<a href=\"%s\">%s</a>",
206+ label = g_strdup_printf ("<a href=\"%s\">%s</a>",
207 "help:ubuntu-help/user-goodpassword",
208 old_label);
209- else
210- label = g_strdup_printf ("<a href=\"%s\">%s</a>",
211- "help:gnome-help/user-goodpassword",
212- old_label);
213 gtk_label_set_markup (GTK_LABEL (widget), label);
214 g_free (label);
215
216
217=== modified file 'panels/user-accounts/um-user-panel.c'
218--- panels/user-accounts/um-user-panel.c 2016-02-12 10:19:32 +0000
219+++ panels/user-accounts/um-user-panel.c 2016-03-09 22:23:13 +0000
220@@ -1536,10 +1536,7 @@
221 static const char *
222 cc_user_panel_get_help_uri (CcPanel *panel)
223 {
224- if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))
225- return "help:ubuntu-help/user-accounts";
226- else
227- return "help:gnome-help/user-accounts";
228+ return "help:ubuntu-help/user-accounts";
229 }
230
231 static void
232
233=== modified file 'panels/wacom/cc-wacom-panel.c'
234--- panels/wacom/cc-wacom-panel.c 2014-02-19 02:24:52 +0000
235+++ panels/wacom/cc-wacom-panel.c 2016-03-09 22:23:13 +0000
236@@ -124,10 +124,7 @@
237 static const char *
238 cc_wacom_panel_get_help_uri (CcPanel *panel)
239 {
240- if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))
241- return "help:ubuntu-help/wacom";
242- else
243- return "help:gnome-help/wacom";
244+ return "help:ubuntu-help/wacom";
245 }
246
247 static void
248
249=== modified file 'shell/control-center.c'
250--- shell/control-center.c 2014-04-10 11:08:20 +0000
251+++ shell/control-center.c 2016-03-09 22:23:13 +0000
252@@ -181,14 +181,9 @@
253
254 if (panel)
255 uri = cc_panel_get_help_uri (panel);
256- if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))
257- gtk_show_uri (gtk_widget_get_screen (window),
258- uri ? uri : "help:ubuntu-help/prefs",
259- GDK_CURRENT_TIME, NULL);
260- else
261- gtk_show_uri (gtk_widget_get_screen (window),
262- uri ? uri : "help:gnome-help/prefs",
263- GDK_CURRENT_TIME, NULL);
264+ gtk_show_uri (gtk_widget_get_screen (window),
265+ uri ? uri : "help:ubuntu-help/prefs",
266+ GDK_CURRENT_TIME, NULL);
267 }
268
269 static void
270@@ -199,14 +194,9 @@
271 GnomeControlCenter *shell = user_data;
272 GtkWidget *window = cc_shell_get_toplevel (CC_SHELL (shell));
273
274- if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))
275- gtk_show_uri (gtk_widget_get_screen (window),
276- "help:ubuntu-help/prefs",
277- GDK_CURRENT_TIME, NULL);
278- else
279- gtk_show_uri (gtk_widget_get_screen (window),
280- "help:gnome-help/prefs",
281- GDK_CURRENT_TIME, NULL);
282+ gtk_show_uri (gtk_widget_get_screen (window),
283+ "help:ubuntu-help/prefs",
284+ GDK_CURRENT_TIME, NULL);
285 }
286
287 static void

Subscribers

People subscribed via source and target branches