applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix the non-xcursor case for solaris; closes: #319125 (based upon patch

Browse source 
2006-07-24  Sven Herzberg  <herzi@gnome-de.org>

        * gnome-mouse-properties.c: fix the non-xcursor case for solaris;
	closes: #319125 (based upon patch from Glynn Foster)
This commit is contained in:
Sven Herzberg 2006-07-24 11:52:35 +00:00 • committed by Sven Herzberg
parent c7a822c879
commit c5b89b3fe1
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
capplets/mouse/ChangeLog
View file

@ -1,3 +1,8 @@
2006-07-24 Sven Herzberg <herzi@gnome-de.org>
* gnome-mouse-properties.c: fix the non-xcursor case for solaris;
closes: #319125 (based upon patch from Glynn Foster)
2006-07-23 Sebastien Bacher <seb128@debian.org> 2006-07-23 Sebastien Bacher <seb128@debian.org>
* gnome-settings-mouse.desktop.in.in: * gnome-settings-mouse.desktop.in.in:

6
capplets/mouse/gnome-mouse-properties.c
View file

@ -549,7 +549,7 @@ cursor_font_changed (GConfClient *client,
-1); -1);
gtk_tree_model_sort_convert_child_iter_to_iter gtk_tree_model_sort_convert_child_iter_to_iter
(GTK_TREE_MODEL_SORT(smodel), &sort_iter, &iter); (GTK_TREE_MODEL_SORT(smodel), &sort_iter, &iter);
if ((temp_cursor_font == NULL && cursor_font == NULL) || if ((cursor_font == NULL) ||
((temp_cursor_font != NULL && cursor_font != NULL) && ((temp_cursor_font != NULL && cursor_font != NULL) &&
(!strcmp (cursor_font, temp_cursor_font)))) { (!strcmp (cursor_font, temp_cursor_font)))) {
if (!gtk_tree_selection_iter_is_selected (selection, &sort_iter)) if (!gtk_tree_selection_iter_is_selected (selection, &sort_iter))
@ -794,6 +794,10 @@ populate_tree_model(GtkTreeModelSort* model, GtkTreeSelection* selection) {
// add the default x font cursors // add the default x font cursors
cursor_font = read_cursor_font(); cursor_font = read_cursor_font();
if(!cursor_font) {
cursor_font = g_strdup (builtins[0][0]);
}
for(i = 0; i < G_N_ELEMENTS(builtins); i++) { for(i = 0; i < G_N_ELEMENTS(builtins); i++) {
GtkTreeIter iter; GtkTreeIter iter;
gchar* cursor_string; gchar* cursor_string;