[gnome-control-center/extensible-shell] network: Remove socket option

[Thomas Wood <thos src gnome org>]

commit e57f859191e17c15be988fa04fbba65ab7a26fe1
Author: Thomas Wood <thomas wood intel com>
Date:   Wed Apr 21 11:18:31 2010 +0100

    network: Remove socket option
    
    The socket option is now redundant since this protocol is no longer used in
    the shell

 capplets/network/gnome-network-properties.c |   49 ++------------------------
 1 files changed, 4 insertions(+), 45 deletions(-)
---
diff --git a/capplets/network/gnome-network-properties.c b/capplets/network/gnome-network-properties.c
index 48ccc48..aaf1647 100644
--- a/capplets/network/gnome-network-properties.c
+++ b/capplets/network/gnome-network-properties.c
@@ -1367,28 +1367,8 @@ main (int argc, char **argv)
 				    "delete_button_img", NULL};
 	GConfClient *client;
 	GtkWidget   *widget;
-	guint32 socket_id = 0;
-
-	GOptionContext *context;
-	GOptionEntry cap_options[] = {
-		{ "socket",
-		  's',
-		  G_OPTION_FLAG_IN_MAIN,
-		  G_OPTION_ARG_INT,
-		  &socket_id,
-		  /* TRANSLATORS: don't translate the terms in brackets */
-		  N_("ID of the socket to embed in"),
-		  N_("socket") },
-
-		{ NULL }
-	};
-
-	context = g_option_context_new (_("- GNOME Network Preferences"));
-	g_option_context_add_main_entries (context, cap_options,
-					   GETTEXT_PACKAGE);
-
-	capplet_init (context, &argc, &argv);
 
+	capplet_init (NULL, &argc, &argv);
 
 	client = gconf_client_get_default ();
 	gconf_client_add_dir (client, "/system/http_proxy",
@@ -1409,30 +1389,9 @@ main (int argc, char **argv)
 
 	setup_dialog (builder);
 
-	if (socket_id) {
-		GtkWidget *content, *plug;
-
-		/* re-parent contents */
-		content = _gtk_builder_get_widget (builder, "dialog-vbox1");
-
-		plug = gtk_plug_new (socket_id);
-		gtk_widget_reparent (content, plug);
-		g_signal_connect (plug, "destroy", G_CALLBACK (gtk_main_quit),
-				  NULL);
-
-		gtk_widget_show_all (plug);
-
-		gtk_widget_hide (_gtk_builder_get_widget (builder,
-							  "helpbutton1"));
-		gtk_widget_hide (_gtk_builder_get_widget (builder,
-							  "closebutton1"));
-		gtk_container_set_border_width (GTK_CONTAINER (content), 12);
-
-	} else {
-		widget = _gtk_builder_get_widget (builder, "network_dialog");
-		capplet_set_icon (widget, "gnome-network-properties");
-		gtk_widget_show_all (widget);
-	}
+	widget = _gtk_builder_get_widget (builder, "network_dialog");
+	capplet_set_icon (widget, "gnome-network-properties");
+	gtk_widget_show_all (widget);
 
 	gtk_main ();