? diff
? capplets/display/diff
? capplets/display/rotation.patch
? capplets/display/stuff
? capplets/mouse/mouse-capplet-a11y.patch
? m4/intltool.m4
Index: capplets/mouse/gnome-mouse-properties.c
===================================================================
RCS file: /cvs/gnome/gnome-control-center/capplets/mouse/gnome-mouse-properties.c,v
retrieving revision 1.71
diff -u -b -p -r1.71 gnome-mouse-properties.c
--- capplets/mouse/gnome-mouse-properties.c	24 Jul 2006 12:38:02 -0000	1.71
+++ capplets/mouse/gnome-mouse-properties.c	16 Aug 2006 17:07:13 -0000
@@ -674,6 +674,8 @@ populate_tree_model(GtkTreeModelSort* mo
 
 	gchar **iterator = NULL;
 	gchar **paths = NULL;
+	gboolean has_default = FALSE;
+	GtkTreeIter iter;
 
 	GConfClient* client = gconf_client_get_default();
 	GtkListStore* store = GTK_LIST_STORE(gtk_tree_model_sort_get_model(model));
@@ -706,7 +708,6 @@ populate_tree_model(GtkTreeModelSort* mo
 			XcursorImage* cursor;
 			gint sizes[] = { 12, 16, 24, 32, 36, 48, 0 };
 			gint i;
-			GtkTreeIter iter;
 			
 			if(!g_file_test(cursor_dir, G_FILE_TEST_EXISTS)) {
 				g_free(cursor_dir);
@@ -742,6 +743,10 @@ populate_tree_model(GtkTreeModelSort* mo
 							gtk_tree_selection_select_iter(selection,
 										       &sort_iter);
 						}
+
+						if(G_LIKELY(!has_default) && !strcmp(name, "default")) {
+							has_default = TRUE;
+						}
 					}
 				}
 			}
@@ -755,6 +760,16 @@ populate_tree_model(GtkTreeModelSort* mo
 		g_free(fname);
 	}
 	
+	if(G_LIKELY(!has_default)) {
+		gtk_list_store_append(store, &iter);
+		gtk_list_store_set(store, &iter,
+				   COLUMN_PIXBUF, NULL,
+				   COLUMN_TEXT, _("Default Pointer"),
+				   COLUMN_FONT_PATH, "default",
+				   COLUMN_SIZE, 18,
+				   -1);
+	}
+
 	g_free(current_theme);
 
 	if (xpaths != NULL) {
@@ -856,8 +871,6 @@ setup_dialog (GladeXML *dialog, GConfCha
 	GtkWidget         *tree_view;
 	GtkTreeSelection  *selection;
 	GtkTreeModel      *model;
-	GtkCellRenderer   *renderer;
-	GtkTreeViewColumn *column;
 	GConfValue        *value;
 	gchar             *cursor_font;
 	gchar             *message;
@@ -902,22 +915,18 @@ setup_dialog (GladeXML *dialog, GConfCha
 				 model);
 	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
 	gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);
-	column = gtk_tree_view_column_new ();
-	renderer = gtk_cell_renderer_pixbuf_new ();
-	gtk_tree_view_column_pack_start (column, renderer, FALSE);
-	gtk_tree_view_column_set_attributes (column, renderer,
+	gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view), -1,
+						     "Preview", gtk_cell_renderer_pixbuf_new (),
 					     "pixbuf", COLUMN_PIXBUF,
 					     NULL);
-	renderer = gtk_cell_renderer_text_new ();
-	gtk_tree_view_column_pack_start (column, renderer, TRUE);
-	gtk_tree_view_column_set_attributes (column, renderer,
+	gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view), -1,
+						     "Name", gtk_cell_renderer_text_new (),
 					     "markup", COLUMN_TEXT,
 					     NULL);
 
 	/* Add the cursors */
 	populate_tree_model(GTK_TREE_MODEL_SORT(model), selection);
 	g_signal_connect (G_OBJECT (selection), "changed", G_CALLBACK (cursor_changed), NULL);
-	gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column);
 	
 	gconf_peditor_new_boolean
 		(changeset, "/desktop/gnome/peripherals/mouse/locate_pointer", WID ("locate_pointer_toggle"), NULL);
