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



commit e3f56d166c4b6ae516a6c8bfa60059db3e127e76
Author: Thomas Wood <thomas wood intel com>
Date:   Wed Apr 21 10:57:30 2010 +0100

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

 capplets/appearance/appearance-main.c |   32 ++++----------------------------
 1 files changed, 4 insertions(+), 28 deletions(-)
---
diff --git a/capplets/appearance/appearance-main.c b/capplets/appearance/appearance-main.c
index 0d7dbc6..3abce52 100644
--- a/capplets/appearance/appearance-main.c
+++ b/capplets/appearance/appearance-main.c
@@ -123,7 +123,6 @@ main (int argc, char **argv)
   gchar *install_filename = NULL;
   gchar *start_page = NULL;
   gchar **wallpaper_files = NULL;
-  guint  socket_id = 0;
   GOptionContext *option_context;
   GOptionEntry option_entries[] = {
       { "install-theme",
@@ -141,14 +140,6 @@ main (int argc, char **argv)
         /* TRANSLATORS: don't translate the terms in brackets */
         N_("Specify the name of the page to show (theme|background|fonts|interface)"),
         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") },
       { G_OPTION_REMAINING,
       	0,
       	G_OPTION_FLAG_IN_MAIN,
@@ -176,27 +167,12 @@ main (int argc, char **argv)
 
   /* prepare the main window */
   w = appearance_capplet_get_widget (data, "appearance_window");
-  if (socket_id)
-    {
-      GtkWidget *content, *plug;
 
-      /* re-parent contents */
-      content = appearance_capplet_get_widget (data, "main_notebook");
+  capplet_set_icon (w, "preferences-desktop-theme");
+  gtk_widget_show_all (w);
 
-      plug = gtk_plug_new (socket_id);
-      g_signal_connect (plug, "destroy", G_CALLBACK (gtk_main_quit), NULL);
-
-      gtk_widget_reparent (content, plug);
-      gtk_widget_show_all (plug);
-    }
-  else
-    {
-      capplet_set_icon (w, "preferences-desktop-theme");
-      gtk_widget_show_all (w);
-
-      g_signal_connect_after (w, "response",
-                              (GCallback) main_window_response, data);
-    }
+  g_signal_connect_after (w, "response",
+                          (GCallback) main_window_response, data);
 
   /* default to background page if files were given on the command line */
   if (wallpaper_files && !install_filename && !start_page)



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