Unity Control Center

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

  1. always-ubuntu-help
  2. Merge into trunk
Proposed by Robert Ancell
Status: Merged
Approved by: Sebastien Bacher
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 Approve
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.
lp:~robert-ancell/unity-control-center/always-ubuntu-help updated
12853. By Robert Ancell

Drop unnecessary code

12854. By Robert Ancell

Drop unnecessary code

Revision history for this message
Sebastien Bacher (seb128) wrote :

great

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'panels/bluetooth/cc-bluetooth-panel.c'
--- panels/bluetooth/cc-bluetooth-panel.c 2015-08-13 15:43:55 +0000
+++ panels/bluetooth/cc-bluetooth-panel.c 2016-03-09 22:23:13 +0000
@@ -77,10 +77,7 @@
77static const char *77static const char *
78cc_bluetooth_panel_get_help_uri (CcPanel *panel)78cc_bluetooth_panel_get_help_uri (CcPanel *panel)
79{79{
80 if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))80 return "help:ubuntu-help/bluetooth";
81 return "help:ubuntu-help/bluetooth";
82 else
83 return "help:gnome-help/bluetooth";
84}81}
8582
86static void83static void
8784
=== modified file 'panels/color/cc-color-panel.c'
--- panels/color/cc-color-panel.c 2014-02-18 03:09:04 +0000
+++ panels/color/cc-color-panel.c 2016-03-09 22:23:13 +0000
@@ -2390,10 +2390,7 @@
2390static const char *2390static const char *
2391cc_color_panel_get_help_uri (CcPanel *panel)2391cc_color_panel_get_help_uri (CcPanel *panel)
2392{2392{
2393 if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))2393 return "help:ubuntu-help/color";
2394 return "help:ubuntu-help/color";
2395 else
2396 return "help:gnome-help/color";
2397}2394}
23982395
2399static void2396static void
@@ -2675,12 +2672,6 @@
2675 g_signal_connect (widget, "realize",2672 g_signal_connect (widget, "realize",
2676 G_CALLBACK (gcm_prefs_window_realize_cb),2673 G_CALLBACK (gcm_prefs_window_realize_cb),
2677 prefs);2674 prefs);
2678
2679 widget = WID (priv->builder, "linkbutton_help");
2680 if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))
2681 g_object_set (G_OBJECT (widget),
2682 "uri", "help:ubuntu-help/color-whyimportant",
2683 NULL);
2684}2675}
26852676
2686void2677void
26872678
=== modified file 'panels/color/color.ui'
--- panels/color/color.ui 2012-05-18 16:39:31 +0000
+++ panels/color/color.ui 2016-03-09 22:23:13 +0000
@@ -174,7 +174,7 @@
174 <property name="use_action_appearance">False</property>174 <property name="use_action_appearance">False</property>
175 <property name="relief">none</property>175 <property name="relief">none</property>
176 <property name="xalign">0.50999999046325684</property>176 <property name="xalign">0.50999999046325684</property>
177 <property name="uri">help:gnome-help/color-whyimportant</property>177 <property name="uri">help:ubuntu-help/color-whyimportant</property>
178 </object>178 </object>
179 <packing>179 <packing>
180 <property name="expand">False</property>180 <property name="expand">False</property>
181181
=== modified file 'panels/display/cc-display-panel.c'
--- panels/display/cc-display-panel.c 2014-08-29 10:26:05 +0000
+++ panels/display/cc-display-panel.c 2016-03-09 22:23:13 +0000
@@ -226,10 +226,7 @@
226static const char *226static const char *
227cc_display_panel_get_help_uri (CcPanel *panel)227cc_display_panel_get_help_uri (CcPanel *panel)
228{228{
229 if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))229 return "help:ubuntu-help/prefs-display";
230 return "help:ubuntu-help/prefs-display";
231 else
232 return "help:gnome-help/prefs-display";
233}230}
234231
235static void232static void
236233
=== modified file 'panels/keyboard/cc-keyboard-panel.c'
--- panels/keyboard/cc-keyboard-panel.c 2012-11-03 14:37:42 +0000
+++ panels/keyboard/cc-keyboard-panel.c 2016-03-09 22:23:13 +0000
@@ -138,7 +138,7 @@
138static const char *138static const char *
139cc_keyboard_panel_get_help_uri (CcPanel *panel)139cc_keyboard_panel_get_help_uri (CcPanel *panel)
140{140{
141 return "help:gnome-help/keyboard";141 return "help:ubuntu-help/keyboard";
142}142}
143143
144static void144static void
145145
=== modified file 'panels/mouse/cc-mouse-panel.c'
--- panels/mouse/cc-mouse-panel.c 2013-11-28 04:32:11 +0000
+++ panels/mouse/cc-mouse-panel.c 2016-03-09 22:23:13 +0000
@@ -107,10 +107,7 @@
107static const char *107static const char *
108cc_mouse_panel_get_help_uri (CcPanel *panel)108cc_mouse_panel_get_help_uri (CcPanel *panel)
109{109{
110 if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))110 return "help:ubuntu-help/mouse";
111 return "help:ubuntu-help/mouse";
112 else
113 return "help:gnome-help/mouse";
114}111}
115112
116static void113static void
117114
=== modified file 'panels/network/cc-network-panel.c'
--- panels/network/cc-network-panel.c 2015-09-15 17:00:16 +0000
+++ panels/network/cc-network-panel.c 2016-03-09 22:23:13 +0000
@@ -242,10 +242,7 @@
242static const char *242static const char *
243cc_network_panel_get_help_uri (CcPanel *panel)243cc_network_panel_get_help_uri (CcPanel *panel)
244{244{
245 if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))245 return "help:ubuntu-help/net";
246 return "help:ubuntu-help/net";
247 else
248 return "help:gnome-help/net";
249}246}
250247
251static void248static void
252249
=== modified file 'panels/power/cc-power-panel.c'
--- panels/power/cc-power-panel.c 2014-10-30 15:11:06 +0000
+++ panels/power/cc-power-panel.c 2016-03-09 22:23:13 +0000
@@ -168,10 +168,7 @@
168static const char *168static const char *
169cc_power_panel_get_help_uri (CcPanel *panel)169cc_power_panel_get_help_uri (CcPanel *panel)
170{170{
171 if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))171 return "help:ubuntu-help/power";
172 return "help:ubuntu-help/power";
173 else
174 return "help:gnome-help/power";
175}172}
176173
177static void174static void
178175
=== modified file 'panels/printers/cc-printers-panel.c'
--- panels/printers/cc-printers-panel.c 2014-02-18 03:09:04 +0000
+++ panels/printers/cc-printers-panel.c 2016-03-09 22:23:13 +0000
@@ -251,10 +251,7 @@
251static const char *251static const char *
252cc_printers_panel_get_help_uri (CcPanel *panel)252cc_printers_panel_get_help_uri (CcPanel *panel)
253{253{
254 if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))254 return "help:ubuntu-help/printing";
255 return "help:ubuntu-help/printing";
256 else
257 return "help:gnome-help/printing";
258}255}
259256
260static void257static void
261258
=== modified file 'panels/region/cc-region-panel.c'
--- panels/region/cc-region-panel.c 2014-09-15 20:22:00 +0000
+++ panels/region/cc-region-panel.c 2016-03-09 22:23:13 +0000
@@ -142,7 +142,7 @@
142static const char *142static const char *
143cc_region_panel_get_help_uri (CcPanel *panel)143cc_region_panel_get_help_uri (CcPanel *panel)
144{144{
145 return "help:gnome-help/prefs-language";145 return "help:ubuntu-help/prefs-language";
146}146}
147147
148static void148static void
149149
=== modified file 'panels/screen/cc-screen-panel.c'
--- panels/screen/cc-screen-panel.c 2014-02-18 04:27:04 +0000
+++ panels/screen/cc-screen-panel.c 2016-03-09 22:23:13 +0000
@@ -148,10 +148,7 @@
148static const char *148static const char *
149cc_screen_panel_get_help_uri (CcPanel *panel)149cc_screen_panel_get_help_uri (CcPanel *panel)
150{150{
151 if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))151 return "help:ubuntu-help/prefs-display";
152 return "help:ubuntu-help/prefs-display";
153 else
154 return "help:gnome-help/prefs-display";
155}152}
156153
157static void154static void
158155
=== modified file 'panels/universal-access/cc-ua-panel.c'
--- panels/universal-access/cc-ua-panel.c 2014-03-28 12:57:57 +0000
+++ panels/universal-access/cc-ua-panel.c 2016-03-09 22:23:13 +0000
@@ -173,10 +173,7 @@
173static const char *173static const char *
174cc_ua_panel_get_help_uri (CcPanel *panel)174cc_ua_panel_get_help_uri (CcPanel *panel)
175{175{
176 if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))176 return "help:ubuntu-help/a11y";
177 return "help:ubuntu-help/a11y";
178 else
179 return "help:gnome-help/a11y";
180}177}
181178
182static void179static void
183180
=== modified file 'panels/user-accounts/um-password-dialog.c'
--- panels/user-accounts/um-password-dialog.c 2014-04-25 01:43:30 +0000
+++ panels/user-accounts/um-password-dialog.c 2016-03-09 22:23:13 +0000
@@ -621,14 +621,9 @@
621621
622 widget = (GtkWidget *) gtk_builder_get_object (builder, "password-normal-strength-hints-label");622 widget = (GtkWidget *) gtk_builder_get_object (builder, "password-normal-strength-hints-label");
623 old_label = gtk_label_get_label (GTK_LABEL (widget));623 old_label = gtk_label_get_label (GTK_LABEL (widget));
624 if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))624 label = g_strdup_printf ("<a href=\"%s\">%s</a>",
625 label = g_strdup_printf ("<a href=\"%s\">%s</a>",
626 "help:ubuntu-help/user-goodpassword",625 "help:ubuntu-help/user-goodpassword",
627 old_label);626 old_label);
628 else
629 label = g_strdup_printf ("<a href=\"%s\">%s</a>",
630 "help:gnome-help/user-goodpassword",
631 old_label);
632 gtk_label_set_markup (GTK_LABEL (widget), label);627 gtk_label_set_markup (GTK_LABEL (widget), label);
633 g_free (label);628 g_free (label);
634629
635630
=== modified file 'panels/user-accounts/um-user-panel.c'
--- panels/user-accounts/um-user-panel.c 2016-02-12 10:19:32 +0000
+++ panels/user-accounts/um-user-panel.c 2016-03-09 22:23:13 +0000
@@ -1536,10 +1536,7 @@
1536static const char *1536static const char *
1537cc_user_panel_get_help_uri (CcPanel *panel)1537cc_user_panel_get_help_uri (CcPanel *panel)
1538{1538{
1539 if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))1539 return "help:ubuntu-help/user-accounts";
1540 return "help:ubuntu-help/user-accounts";
1541 else
1542 return "help:gnome-help/user-accounts";
1543}1540}
15441541
1545static void1542static void
15461543
=== modified file 'panels/wacom/cc-wacom-panel.c'
--- panels/wacom/cc-wacom-panel.c 2014-02-19 02:24:52 +0000
+++ panels/wacom/cc-wacom-panel.c 2016-03-09 22:23:13 +0000
@@ -124,10 +124,7 @@
124static const char *124static const char *
125cc_wacom_panel_get_help_uri (CcPanel *panel)125cc_wacom_panel_get_help_uri (CcPanel *panel)
126{126{
127 if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))127 return "help:ubuntu-help/wacom";
128 return "help:ubuntu-help/wacom";
129 else
130 return "help:gnome-help/wacom";
131}128}
132129
133static void130static void
134131
=== modified file 'shell/control-center.c'
--- shell/control-center.c 2014-04-10 11:08:20 +0000
+++ shell/control-center.c 2016-03-09 22:23:13 +0000
@@ -181,14 +181,9 @@
181181
182 if (panel)182 if (panel)
183 uri = cc_panel_get_help_uri (panel);183 uri = cc_panel_get_help_uri (panel);
184 if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))184 gtk_show_uri (gtk_widget_get_screen (window),
185 gtk_show_uri (gtk_widget_get_screen (window),185 uri ? uri : "help:ubuntu-help/prefs",
186 uri ? uri : "help:ubuntu-help/prefs",186 GDK_CURRENT_TIME, NULL);
187 GDK_CURRENT_TIME, NULL);
188 else
189 gtk_show_uri (gtk_widget_get_screen (window),
190 uri ? uri : "help:gnome-help/prefs",
191 GDK_CURRENT_TIME, NULL);
192}187}
193188
194static void189static void
@@ -199,14 +194,9 @@
199 GnomeControlCenter *shell = user_data;194 GnomeControlCenter *shell = user_data;
200 GtkWidget *window = cc_shell_get_toplevel (CC_SHELL (shell));195 GtkWidget *window = cc_shell_get_toplevel (CC_SHELL (shell));
201 196
202 if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))197 gtk_show_uri (gtk_widget_get_screen (window),
203 gtk_show_uri (gtk_widget_get_screen (window),198 "help:ubuntu-help/prefs",
204 "help:ubuntu-help/prefs",199 GDK_CURRENT_TIME, NULL);
205 GDK_CURRENT_TIME, NULL);
206 else
207 gtk_show_uri (gtk_widget_get_screen (window),
208 "help:gnome-help/prefs",
209 GDK_CURRENT_TIME, NULL);
210}200}
211201
212static void202static void

Subscribers

People subscribed via source and target branches