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



commit 127b87dd76e8d57b27cb91faadbc006a77d9fcdf
Author: Thomas Wood <thomas wood intel com>
Date:   Wed Apr 21 10:53:50 2010 +0100

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

 capplets/mouse/gnome-mouse-properties.c |   32 +++---------------------------
 1 files changed, 4 insertions(+), 28 deletions(-)
---
diff --git a/capplets/mouse/gnome-mouse-properties.c b/capplets/mouse/gnome-mouse-properties.c
index 7857130..1e0cbdc 100644
--- a/capplets/mouse/gnome-mouse-properties.c
+++ b/capplets/mouse/gnome-mouse-properties.c
@@ -602,8 +602,7 @@ main (int argc, char **argv)
 	GConfClient    *client;
 	GtkBuilder     *dialog;
 	GtkWidget      *dialog_win, *w;
-	gchar *start_page = NULL;
-	guint32 socket_id = 0;
+	gchar          *start_page = NULL;
 
 	GOptionContext *context;
 	GOptionEntry cap_options[] = {
@@ -613,14 +612,6 @@ main (int argc, char **argv)
 		 /* TRANSLATORS: don't translate the terms in brackets */
 		 N_("Specify the name of the page to show (general|accessibility)"),
 		 N_("page") },
-		{ "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}
 	};
 
@@ -639,24 +630,9 @@ main (int argc, char **argv)
 	if (dialog) {
 		setup_accessibility (dialog, client);
 
-		if (socket_id) {
-			GtkWidget *content, *plug;
-
-			/* re-parent contents */
-			content = WID ("prefs_widget");
-
-			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);
-			dialog_win = plug;
-		}
-		else {
-			dialog_win = WID ("mouse_properties_dialog");
-			g_signal_connect (dialog_win, "response",
-					  G_CALLBACK (dialog_response_cb), NULL);
-		}
+		dialog_win = WID ("mouse_properties_dialog");
+		g_signal_connect (dialog_win, "response",
+				  G_CALLBACK (dialog_response_cb), NULL);
 
 		if (start_page != NULL) {
 			gchar *page_name;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]