diff --git a/gnome/ChangeLog b/gnome/ChangeLog index 01b318fee..44b0b86a9 100644 --- a/gnome/ChangeLog +++ b/gnome/ChangeLog @@ -1,5 +1,10 @@ 1998-05-20 Federico Mena Quintero + * gpageprop.c (item_properties): Restore the arrow cursor for the + desktop icon windows. + + * gdesktop.h (desktop_icon_t): Removed unused title field. + * gtrans.c (set_window_text): Made it use the new GnomeIconTextInfo functions. diff --git a/gnome/gdesktop.h b/gnome/gdesktop.h index 09dcc0a5f..93403142f 100644 --- a/gnome/gdesktop.h +++ b/gnome/gdesktop.h @@ -28,7 +28,6 @@ typedef struct { icon_t type; int x, y; int grid_x, grid_y; - char *title; char *pathname; } desktop_icon_t; diff --git a/gnome/gpageprop.c b/gnome/gpageprop.c index 04eecf146..ab35b147e 100644 --- a/gnome/gpageprop.c +++ b/gnome/gpageprop.c @@ -49,7 +49,7 @@ int item_properties (GtkWidget *parent, char *fname, desktop_icon_t *di) { GtkWidget *parent_window; - GdkCursor *clock_cursor; + GdkCursor *cursor; GtkWidget *notebook, *ok, *cancel; GtkWidget *vbox; GpropFilename *name; @@ -72,8 +72,9 @@ item_properties (GtkWidget *parent, char *fname, desktop_icon_t *di) /* Set a clock cursor while we create stuff and read users/groups */ parent_window = gtk_widget_get_toplevel (parent); - clock_cursor = gdk_cursor_new (GDK_WATCH); - gdk_window_set_cursor (parent_window->window, clock_cursor); + cursor = gdk_cursor_new (GDK_WATCH); + gdk_window_set_cursor (parent_window->window, cursor); + gdk_cursor_destroy (cursor); toplevel = GTK_DIALOG (gtk_dialog_new ()); notebook = gtk_notebook_new (); @@ -123,11 +124,15 @@ item_properties (GtkWidget *parent, char *fname, desktop_icon_t *di) gtk_widget_grab_default (ok); gtk_widget_show_all (GTK_WIDGET (toplevel)); - gdk_window_set_cursor (parent_window->window, NULL); + /* Restore the arrow cursor and run the dialog */ + + cursor = gdk_cursor_new (GDK_TOP_LEFT_ARROW); + gdk_window_set_cursor (parent_window->window, cursor); + gdk_cursor_destroy (cursor); + gtk_grab_add (GTK_WIDGET (toplevel)); gtk_main (); gtk_grab_remove (GTK_WIDGET (toplevel)); - gdk_cursor_destroy (clock_cursor); if (prop_dialog_result != 0) { gtk_widget_destroy (GTK_WIDGET (toplevel));