1999-03-25 Jonathan Blandford <jrb@redhat.com>

* gdesktop.c (set_background_image): now we can set the background
	from GMC.

gnome/ChangeLog

@@ -1,3 +1,8 @@
+1999-03-25  Jonathan Blandford  <jrb@redhat.com>
+
+	* gdesktop.c (set_background_image): now we can set the background
+	from GMC.
+
 1999-03-22  Miguel de Icaza  <miguel@nuclecu.unam.mx>
 
 	* glayout.c (create_new_menu_from): closedir after running.

gnome/gdesktop.c

@@ -2394,8 +2394,28 @@ handle_rescan_desktop (GtkWidget *widget, gpointer data)
 {
 	desktop_reload_icons (FALSE, 0, 0);
 }
+static void
+set_background_image (GtkWidget *widget, gpointer data)
+{
+	gchar *bg_capplet;
+	gchar *argv[1];
+	bg_capplet = gnome_is_program_in_path ("background-properties-capplet");
+	if (bg_capplet) {
+		argv[0] = bg_capplet;
+		gnome_execute_async (bg_capplet, 1, argv);
+		g_free (bg_capplet);
+	} else {
+		GtkWidget *msg_box;
+		msg_box = gnome_message_box_new (_("Unable to locate the file:\nbackground-properties-capplet\n"
+						   "in your path.\n\nWe are unable to set the background."),
+						 GNOME_MESSAGE_BOX_WARNING,
+						 GNOME_STOCK_BUTTON_OK,
+						 NULL);
+		gnome_dialog_run (msg_box);
+	}
+}
 static GnomeUIInfo gnome_panel_new_menu [] = {
-	 GNOMEUIINFO_ITEM_NONE(N_("_Terminal"), N_("Launch a new terminal in the current directory"), gnome_open_terminal),
+	GNOMEUIINFO_ITEM_NONE(N_("_Terminal"), N_("Launch a new terminal in the current directory"), gnome_open_terminal),
 	/* If this ever changes, make sure you update create_new_menu accordingly. */
 	GNOMEUIINFO_ITEM_NONE( N_("_Directory..."), N_("Creates a new directory"), gnome_mkdir_cmd ),
 	GNOMEUIINFO_ITEM_NONE( N_("_Launcher..."), N_("Creates a new launcher"), gnome_new_launcher ),
@@ -2411,6 +2431,7 @@ GnomeUIInfo desktop_popup_items[] = {
 	GNOMEUIINFO_SEPARATOR,
 	GNOMEUIINFO_ITEM_NONE (N_("Recreate Desktop Shortcuts"), NULL, handle_rescan_devices),
 	GNOMEUIINFO_ITEM_NONE (N_("Rescan Desktop"), NULL, handle_rescan_desktop),
+	GNOMEUIINFO_ITEM_NONE (N_("Configure Background Image"), NULL, set_background_image),
 	GNOMEUIINFO_END
 };
 

gnome/gscreen.c

@@ -2137,12 +2137,11 @@ panel_tree_drag_motion (GtkWidget *widget, GdkDragContext *ctx, int x, int y, gu
 		GtkCTreeNode *current;
 		current = gtk_ctree_node_nth (GTK_CTREE (widget), row);
 		panel_tree_check_auto_expand (panel, current);
+		GTK_DTREE (widget)->internal = TRUE;
+		gtk_clist_select_row (GTK_CLIST (widget), row, 0);
+		GTK_DTREE (widget)->internal = FALSE;
 	} else
 		panel_tree_check_auto_expand (panel, NULL);
-	GTK_DTREE (widget)->internal = TRUE;
-	gtk_clist_select_row (GTK_CLIST (widget), row, 0);
-	GTK_DTREE (widget)->internal = FALSE;
-	
 	panel->timer_id = gtk_timeout_add (400, tree_drag_open_directory, data);
 	return TRUE;
 }

gnome/gtkdtree.c

@@ -215,8 +215,9 @@ gtk_dtree_select_row (GtkCTree *ctree, GtkCTreeNode *row, gint column)
 	
 	parent_class->tree_select_row (ctree, row, column);
 
-	if (row == dtree->last_node)
+	if (row == dtree->last_node) {
 		return;
+	}
 
 	dtree->loading_dir++;
 	dtree->last_node = row;