[gnome-control-center/T20818: 5/54] Fixup help center panel links

[Georges Basile Stavracas Neto <gbsneto src gnome org>]

commit 0e4457d8d581f6dbd0a452646299d51dde76f9ae
Author: Matt Watson <mattdangerw gmail com>
Date:   Tue Dec 9 17:24:49 2014 -0800

    Fixup help center panel links
    
    Our help structure has diverged significantly from upstream, so we
    need to update the control center panels to point to the correct pages
    [endlessm/eos-shell#4160]

 panels/color/cc-color-panel.c                     |    9 ---------
 panels/datetime/cc-datetime-panel.c               |    2 +-
 panels/display/cc-display-panel.c                 |    2 +-
 panels/online-accounts/cc-online-accounts-panel.c |    2 +-
 panels/power/cc-power-panel.c                     |    9 ---------
 panels/printers/cc-printers-panel.c               |    2 +-
 panels/privacy/cc-privacy-panel.c                 |    2 +-
 panels/region/cc-region-panel.c                   |    2 +-
 panels/sharing/cc-sharing-panel.c                 |    2 +-
 panels/sound/cc-sound-panel.c                     |    2 +-
 panels/user-accounts/um-user-panel.c              |    2 +-
 panels/wacom/cc-wacom-panel.c                     |    7 -------
 shell/cc-application.c                            |    2 +-
 13 files changed, 10 insertions(+), 35 deletions(-)
---
diff --git a/panels/color/cc-color-panel.c b/panels/color/cc-color-panel.c
index 2bbe41a..4130661 100644
--- a/panels/color/cc-color-panel.c
+++ b/panels/color/cc-color-panel.c
@@ -2090,12 +2090,6 @@ gcm_prefs_window_realize_cb (GtkWidget *widget, CcColorPanel *prefs)
   prefs->priv->main_window = gtk_widget_get_toplevel (widget);
 }
 
-static const char *
-cc_color_panel_get_help_uri (CcPanel *panel)
-{
-  return "help:gnome-help/color";
-}
-
 static void
 cc_color_panel_get_property (GObject    *object,
                               guint       property_id,
@@ -2183,12 +2177,9 @@ static void
 cc_color_panel_class_init (CcColorPanelClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  CcPanelClass *panel_class = CC_PANEL_CLASS (klass);
 
   g_type_class_add_private (klass, sizeof (CcColorPanelPrivate));
 
-  panel_class->get_help_uri = cc_color_panel_get_help_uri;
-
   object_class->get_property = cc_color_panel_get_property;
   object_class->set_property = cc_color_panel_set_property;
   object_class->dispose = cc_color_panel_dispose;
diff --git a/panels/datetime/cc-datetime-panel.c b/panels/datetime/cc-datetime-panel.c
index 5500b05..bb0ab87 100644
--- a/panels/datetime/cc-datetime-panel.c
+++ b/panels/datetime/cc-datetime-panel.c
@@ -155,7 +155,7 @@ cc_date_time_panel_get_permission (CcPanel *panel)
 static const char *
 cc_date_time_panel_get_help_uri (CcPanel *panel)
 {
-  return "help:gnome-help/clock";
+  return "help:gnome-help/shell-overview#time";
 }
 
 static void
diff --git a/panels/display/cc-display-panel.c b/panels/display/cc-display-panel.c
index f98b397..66b2166 100644
--- a/panels/display/cc-display-panel.c
+++ b/panels/display/cc-display-panel.c
@@ -359,7 +359,7 @@ cc_display_panel_constructed (GObject *object)
 static const char *
 cc_display_panel_get_help_uri (CcPanel *panel)
 {
-  return "help:gnome-help/prefs-display";
+  return "help:gnome-help/hardware#displays";
 }
 
 static void
diff --git a/panels/online-accounts/cc-online-accounts-panel.c 
b/panels/online-accounts/cc-online-accounts-panel.c
index edd140e..ec93a71 100644
--- a/panels/online-accounts/cc-online-accounts-panel.c
+++ b/panels/online-accounts/cc-online-accounts-panel.c
@@ -488,7 +488,7 @@ cc_goa_panel_init (CcGoaPanel *panel)
 static const char *
 cc_goa_panel_get_help_uri (CcPanel *panel)
 {
-  return "help:gnome-help/accounts";
+  return "help:gnome-help/net#social";
 }
 
 static void
diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
index e32d965..38c5942 100644
--- a/panels/power/cc-power-panel.c
+++ b/panels/power/cc-power-panel.c
@@ -159,23 +159,14 @@ cc_power_panel_dispose (GObject *object)
   G_OBJECT_CLASS (cc_power_panel_parent_class)->dispose (object);
 }
 
-static const char *
-cc_power_panel_get_help_uri (CcPanel *panel)
-{
-  return "help:gnome-help/power";
-}
-
 static void
 cc_power_panel_class_init (CcPowerPanelClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  CcPanelClass *panel_class = CC_PANEL_CLASS (klass);
 
   g_type_class_add_private (klass, sizeof (CcPowerPanelPrivate));
 
   object_class->dispose = cc_power_panel_dispose;
-
-  panel_class->get_help_uri = cc_power_panel_get_help_uri;
 }
 
 static GtkWidget *
diff --git a/panels/printers/cc-printers-panel.c b/panels/printers/cc-printers-panel.c
index cb9b920..c4d429d 100644
--- a/panels/printers/cc-printers-panel.c
+++ b/panels/printers/cc-printers-panel.c
@@ -292,7 +292,7 @@ cc_printers_panel_finalize (GObject *object)
 static const char *
 cc_printers_panel_get_help_uri (CcPanel *panel)
 {
-  return "help:gnome-help/printing";
+  return "help:gnome-help/hardware#printers";
 }
 
 static void
diff --git a/panels/privacy/cc-privacy-panel.c b/panels/privacy/cc-privacy-panel.c
index 428dafe..fe2e5c7 100644
--- a/panels/privacy/cc-privacy-panel.c
+++ b/panels/privacy/cc-privacy-panel.c
@@ -1280,7 +1280,7 @@ cc_privacy_panel_finalize (GObject *object)
 static const char *
 cc_privacy_panel_get_help_uri (CcPanel *panel)
 {
-  return "help:gnome-help/privacy";
+  return "help:gnome-help/shell-overview#lock";
 }
 
 static void
diff --git a/panels/region/cc-region-panel.c b/panels/region/cc-region-panel.c
index 48c0d7a..2fe1771 100644
--- a/panels/region/cc-region-panel.c
+++ b/panels/region/cc-region-panel.c
@@ -187,7 +187,7 @@ cc_region_panel_constructed (GObject *object)
 static const char *
 cc_region_panel_get_help_uri (CcPanel *panel)
 {
-        return "help:gnome-help/prefs-language";
+        return "help:gnome-help/session-language";
 }
 
 static void
diff --git a/panels/sharing/cc-sharing-panel.c b/panels/sharing/cc-sharing-panel.c
index 5add115..c83cea2 100644
--- a/panels/sharing/cc-sharing-panel.c
+++ b/panels/sharing/cc-sharing-panel.c
@@ -185,7 +185,7 @@ cc_sharing_panel_dispose (GObject *object)
 static const char *
 cc_sharing_panel_get_help_uri (CcPanel *panel)
 {
-  return "help:gnome-help/prefs-sharing";
+  return "help:gnome-help/sharing-bluetooth";
 }
 
 static void
diff --git a/panels/sound/cc-sound-panel.c b/panels/sound/cc-sound-panel.c
index d715e9a..88d5b3f 100644
--- a/panels/sound/cc-sound-panel.c
+++ b/panels/sound/cc-sound-panel.c
@@ -70,7 +70,7 @@ cc_sound_panel_set_property (GObject      *object,
 static const char *
 cc_sound_panel_get_help_uri (CcPanel *panel)
 {
-  return "help:gnome-help/media#sound";
+  return "help:gnome-help/hardware#sound";
 }
 
 static void
diff --git a/panels/user-accounts/um-user-panel.c b/panels/user-accounts/um-user-panel.c
index c1875cb..24d69ae 100644
--- a/panels/user-accounts/um-user-panel.c
+++ b/panels/user-accounts/um-user-panel.c
@@ -1537,7 +1537,7 @@ cc_user_panel_dispose (GObject *object)
 static const char *
 cc_user_panel_get_help_uri (CcPanel *panel)
 {
-       return "help:gnome-help/user-accounts";
+       return "help:gnome-help/security-and-privacy#user";
 }
 
 static void
diff --git a/panels/wacom/cc-wacom-panel.c b/panels/wacom/cc-wacom-panel.c
index 77a1e26..9fff155 100644
--- a/panels/wacom/cc-wacom-panel.c
+++ b/panels/wacom/cc-wacom-panel.c
@@ -424,12 +424,6 @@ cc_wacom_panel_constructed (GObject *object)
                                 G_CALLBACK (on_shell_event_cb), self, 0);
 }
 
-static const char *
-cc_wacom_panel_get_help_uri (CcPanel *panel)
-{
-  return "help:gnome-help/wacom";
-}
-
 static GtkWidget *
 cc_wacom_panel_get_title_widget (CcPanel *panel)
 {
@@ -451,7 +445,6 @@ cc_wacom_panel_class_init (CcWacomPanelClass *klass)
        object_class->dispose = cc_wacom_panel_dispose;
        object_class->constructed = cc_wacom_panel_constructed;
 
-       panel_class->get_help_uri = cc_wacom_panel_get_help_uri;
        panel_class->get_title_widget = cc_wacom_panel_get_title_widget;
 
        g_object_class_override_property (object_class, PROP_PARAMETERS, "parameters");
diff --git a/shell/cc-application.c b/shell/cc-application.c
index c160899..260c14f 100644
--- a/shell/cc-application.c
+++ b/shell/cc-application.c
@@ -67,7 +67,7 @@ help_activated (GSimpleAction *action,
 
   window = cc_shell_get_toplevel (CC_SHELL (self->priv->window));
   gtk_show_uri (gtk_widget_get_screen (window),
-                uri ? uri : "help:gnome-help/prefs",
+                uri ? uri : "help:gnome-help",
                 GDK_CURRENT_TIME, NULL);
 }