[gnome-control-center/extensible-shell] Revert "[about-me] add a --socket option"

[Thomas Wood <thos src gnome org>]

commit 48cc93d712d01e7ce7ae6d88837b04cbfb71a47f
Author: Thomas Wood <thomas wood intel com>
Date:   Tue May 4 22:18:53 2010 +0100

    Revert "[about-me] add a --socket option"
    
    This reverts commit 567c780dcce1ac69301b3703a945808a493567ac.

 capplets/about-me/gnome-about-me.c |   49 ++++++------------------------------
 1 files changed, 8 insertions(+), 41 deletions(-)
---
diff --git a/capplets/about-me/gnome-about-me.c b/capplets/about-me/gnome-about-me.c
index c057215..8fb60ab 100644
--- a/capplets/about-me/gnome-about-me.c
+++ b/capplets/about-me/gnome-about-me.c
@@ -840,7 +840,7 @@ about_me_fingerprint_button_clicked_cb (GtkWidget *button, GnomeAboutMe *me)
 }
 
 static gint
-about_me_setup_dialog (guint32 socket_id)
+about_me_setup_dialog (void)
 {
 	GtkWidget    *widget;
 	GtkWidget    *main_dialog;
@@ -865,25 +865,10 @@ about_me_setup_dialog (guint32 socket_id)
 
 	me->dialog = dialog;
 
-	if (socket_id) {
-		GtkWidget *content, *plug;
-
-		/* re-parent contents */
-		content = WID ("vbox55");
-
-		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);
-		main_dialog = plug;
-	}
-	else {
-		main_dialog = WID ("about-me-dialog");
-		g_signal_connect (main_dialog, "response",
-				  G_CALLBACK (about_me_button_clicked_cb), me);
-	}
+	/* Connect the close button signal */
+	main_dialog = WID ("about-me-dialog");
+	g_signal_connect (main_dialog, "response",
+			  G_CALLBACK (about_me_button_clicked_cb), me);
 
 	gtk_window_set_resizable (GTK_WINDOW (main_dialog), FALSE);
 	capplet_set_icon (main_dialog, "user-info");
@@ -1005,26 +990,8 @@ int
 main (int argc, char **argv)
 {
 	int rc = 0;
-	guint32 socket_id;
-
-	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 About Me"));
-	g_option_context_add_main_entries (context, cap_options,
-					   GETTEXT_PACKAGE);
-
-	capplet_init (context, &argc, &argv);
+
+	capplet_init (NULL, &argc, &argv);
 
 	if (!g_thread_supported ())
 		g_thread_init (NULL);
@@ -1032,7 +999,7 @@ main (int argc, char **argv)
 	dbus_g_object_register_marshaller (fprintd_marshal_VOID__STRING_BOOLEAN,
 					   G_TYPE_NONE, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_INVALID);
 
-	rc = about_me_setup_dialog (socket_id);
+	rc = about_me_setup_dialog ();
 
 	if (rc != -1) {
 		gtk_main ();