Merge lp:~tombeckmann/pantheon-plugs/gcc-links into lp:~elementary-apps/pantheon-plugs/dynamic-gcc-plug-freya

[Tom Beckmann]

This implements the link functionality in GCC plugs by taking advantage of the single instance system of GApplication, which allows us to just run the switchboard exec to tell the shell to go to a different plug.

[lp:~tombeckmann/pantheon-plugs/gcc-links]

45. By Launchpad Translations on behalf of elementary-apps on 2014-07-14

Launchpad automatic translations update.

46. By Launchpad Translations on behalf of elementary-apps on 2014-07-15

Launchpad automatic translations update.

47. By Launchpad Translations on behalf of elementary-apps on 2014-07-16

Launchpad automatic translations update.

48. By Launchpad Translations on behalf of elementary-apps on 2014-07-19

Launchpad automatic translations update.

49. By Launchpad Translations on behalf of elementary-apps on 2014-08-03

Launchpad automatic translations update.

50. By Tom Beckmann on 2014-08-13

support links in gcc plugs

=== modified file 'libgnome-control-center/switchboard-shell.c'
--- libgnome-control-center/switchboard-shell.c	2014-07-07 22:24:03 +0000
+++ libgnome-control-center/switchboard-shell.c	2014-08-13 23:34:34 +0000
@@ -23,7 +23,19 @@
 _shell_set_active_panel_from_id (CcShell *shell, const gchar **start_id,
 	const gchar **argv, GError **error)
 {
-	// FIXME do we need this?
+	GError *e = NULL;
+	gchar *prog_name;
+	gchar *app[3];
+
+	prog_name = g_getenv ("_");
+	app[0] = prog_name;
+	app[1] = start_id;
+	app[2] = NULL;
+
+	if (!g_spawn_async (NULL, app, NULL, G_SPAWN_DEFAULT, NULL, NULL, NULL, &e)) {
+		g_warning ("Opening link failed: %s", e->message);
+		g_error_free (e);
+	}
 }
 
 static void

=== modified file 'plugs/Bluetooth/BluetoothPlug.vala'
--- plugs/Bluetooth/BluetoothPlug.vala	2014-04-14 17:14:38 +0000
+++ plugs/Bluetooth/BluetoothPlug.vala	2014-08-13 23:34:34 +0000
@@ -26,12 +26,16 @@
     private Cc.Panel panel;
     private Gtk.InfoBar infobar;
 
+    SwitchboardShell shell;
+
     public Plug () {
         Object (category: Category.NETWORK,
                 code_name: "network-gcc-bluetooth",
                 display_name: GLib.dgettext ("gnome-control-center-2.0", "Bluetooth"),
                 description: GLib.dgettext ("gnome-control-center-2.0", "Configure Bluetooth settings"),
                 icon: "bluetooth");
+
+        shell = new SwitchboardShell ();
     }
 
     public override Gtk.Widget get_widget () {
@@ -53,7 +57,7 @@
         if (GLib.Type.from_name ("CcBluetoothPanel") == 0) {
             panel = Object.new(typeof(Cc.GnomeCCPanel)) as Cc.Panel;
         } else {
-            panel = Object.new(GLib.Type.from_name ("CcBluetoothPanel")) as Cc.Panel;
+            panel = Object.new(GLib.Type.from_name ("CcBluetoothPanel"), "shell", shell.@ref ()) as Cc.Panel;
         }
 
         //It's hacky but needed to have it looking good…
@@ -103,4 +107,4 @@
     debug ("Activating Bluetooth plug");
     var plug = new GCC.Bluetooth.Plug ();
     return plug;
-}
\ No newline at end of file
+}

=== modified file 'plugs/UniversalAccess/UniversalAccessPlug.vala'
--- plugs/UniversalAccess/UniversalAccessPlug.vala	2014-04-14 17:14:38 +0000
+++ plugs/UniversalAccess/UniversalAccessPlug.vala	2014-08-13 23:34:34 +0000
@@ -85,19 +85,6 @@
         return bin.get_child ();
     }
 
-    private void eradicate_linkbuttons (Gtk.Container container) {
-        foreach (var child in container.get_children ()) {
-            if (child == null)
-                continue;
-            if (child is Gtk.Container)
-                eradicate_linkbuttons ((Gtk.Container)child);
-            if (child is Gtk.LinkButton) {
-                child.no_show_all = true;
-                child.hide ();
-            }
-        }
-    }
-
     public Gtk.Grid shamelessly_copy_notebook (Gtk.Notebook notebook) {
         notebook.hide ();
         notebook.no_show_all = true;
@@ -115,8 +102,6 @@
         for (int i=0; i<notebook.get_n_pages (); i++) {
             var widget = notebook.get_nth_page (i);
             var title = notebook.get_tab_label_text (widget);
-            if (widget is Gtk.Container)
-                eradicate_linkbuttons ((Gtk.Container)widget);
             widget.unparent ();
             stack.add_titled (widget, "page #%d".printf (i), title);
         }
@@ -147,4 +132,4 @@
     debug ("Activating UniversalAccess plug");
     var plug = new GCC.UniversalAccess.Plug ();
     return plug;
-}
\ No newline at end of file
+}

=== modified file 'plugs/Wacom/WacomPlug.vala'
--- plugs/Wacom/WacomPlug.vala	2014-04-14 17:14:38 +0000
+++ plugs/Wacom/WacomPlug.vala	2014-08-13 23:34:34 +0000
@@ -26,12 +26,16 @@
     private Gtk.Grid main_grid;
     private Gtk.InfoBar infobar;
 
+    SwitchboardShell shell;
+
     public Plug () {
         Object (category: Category.HARDWARE,
                 code_name: "hardware-gcc-wacom",
                 display_name: GLib.dgettext ("gnome-control-center-2.0", "Wacom Tablet"),
                 description:  GLib.dgettext ("gnome-control-center-2.0", "Set your Wacom tablet preferences"),
                 icon: "input-tablet");
+
+        shell = new SwitchboardShell ();
     }
 
     public override Gtk.Widget get_widget () {
@@ -48,7 +52,7 @@
         if (GLib.Type.from_name ("CcWacomPanel") == 0) {
             panel = Object.new(typeof(Cc.GnomeCCPanel)) as Cc.Panel;
         } else {
-            panel = Object.new(GLib.Type.from_name ("CcWacomPanel")) as Cc.Panel;
+            panel = Object.new(GLib.Type.from_name ("CcWacomPanel"), "shell", shell.@ref ()) as Cc.Panel;
         }
         panel.expand = true;
         var permission = panel.get_permission();
@@ -92,4 +96,4 @@
     debug ("Activating Wacom plug");
     var plug = new GCC.Wacom.Plug ();
     return plug;
-}
\ No newline at end of file
+}