[patch] Patch for /usr/portage/gnome-base/gdm/files

flexi-servers-dialog.patch (text/plain), 3.56 KB, created by Christopher Cowart on 2005-08-10 22:50:29 UTC

diff -ru gdm-2.6.0.9/gui/gdmflexiserver.c gdm-2.6.0.9-patched/gui/gdmflexiserver.c
--- gdm-2.6.0.9/gui/gdmflexiserver.c	2004-02-08 09:58:07.000000000 -0800
+++ gdm-2.6.0.9-patched/gui/gdmflexiserver.c	2005-08-10 22:07:11.000000000 -0700
@@ -298,119 +298,7 @@
 static void
 run_logged_in_dialogue (char **vec)
 {
-	GtkWidget *dialog;
-	GtkWidget *vbox;
-	GtkWidget *w;
-	GtkWidget *sw;
-	GtkTreeModel *model;
-	GtkWidget *treeview;
-	GtkTreeIter iter;
-	GtkTreeSelection *selection;
-
-	dialog = gtk_dialog_new_with_buttons (_("Open Displays"),
-					      NULL /* parent */,
-					      0 /* flags */,
-					      _("_Open New Display"),
-					      RESPONSE_OPEN_NEW_DISPLAY,
-					      _("Change to _Existing Display"),
-					      RESPONSE_OPEN_EXISTING_DISPLAY,
-					      GTK_STOCK_CANCEL,
-					      GTK_RESPONSE_CANCEL,
-					      NULL);
-	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
-	vbox = GTK_DIALOG (dialog)->vbox;
-
-	w = gtk_label_new (_("There are some displays already open.  You can select "
-			     "one from the list below or open a new one."));
-	gtk_box_pack_start (GTK_BOX (vbox), w, FALSE, FALSE, 0);
-
-	sw = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
-					     GTK_SHADOW_ETCHED_IN);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-					GTK_POLICY_NEVER,
-					GTK_POLICY_AUTOMATIC);
-	gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE, 0);
-
-	/* create tree model */
-	model = create_model (vec);
-
-	/* create tree view */
-	treeview = gtk_tree_view_new_with_model (model);
-	gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
-
-	g_object_unref (model);
-
-	gtk_container_add (GTK_CONTAINER (sw), treeview);
-
-	/* add columns to the tree view */
-	add_columns (GTK_TREE_VIEW (treeview));
-
-	/* finish & show */
-	gtk_window_set_default_size (GTK_WINDOW (dialog), 280, 250);
-
-        g_signal_connect (G_OBJECT (treeview), "row_activated",
-			  G_CALLBACK (row_activated),
-			  dialog);
-
-	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
-
-        g_signal_connect (selection, "changed",
-			  G_CALLBACK (selection_changed),
-			  dialog);
-
-	gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog),
-					   RESPONSE_OPEN_EXISTING_DISPLAY,
-					   FALSE);
-
-	gtk_widget_show_all (dialog);
-
-run_again:
-	switch (gtk_dialog_run (GTK_DIALOG (dialog))) {
-	case RESPONSE_OPEN_NEW_DISPLAY:
-		gtk_widget_destroy (dialog);
-		/* just continue what you are doing */
-		return;
-
-	case RESPONSE_OPEN_EXISTING_DISPLAY:
-		if (gtk_tree_selection_get_selected (selection, NULL, &iter)) {
-			GValue value = {0};
-			int vt;
-			gtk_tree_model_get_value (model, &iter,
-						  COLUMN_VT,
-						  &value);
-			vt = g_value_get_int (&value);
-			g_value_unset (&value);
-
-			/* we switched to a different screen as a result of this,
-			 * lock the current screen */
-			if ( ! no_lock && vt != get_cur_vt () && vt >= 0) {
-				char *argv[3] = {"xscreensaver-command", "-lock", NULL};
-				if (gnome_execute_async (g_get_home_dir (), 2, argv) < 0)
-					g_warning (_("Can't lock screen"));
-				argv[1] = "-throttle";
-				if (gnome_execute_async (g_get_home_dir (), 2, argv) < 0)
-					g_warning (_("Can't disable xscreensaver display hacks"));
-			}
-
-			change_vt (vt);
-
-			/* FIXME: wait + disturb the pointer (need SUP?), perhaps
-			 * part of the sup command to CHVT ?? */
-
-			exit (0);
-		} else {
-			/* EEK */
-			goto run_again;
-		}
-		break;
-
-	default:
-		gtk_widget_destroy (dialog);
-		/* cancel, or close */
-		exit (0);
-		break;
-	}
+	return;
 }
 
 static void