diff options
| author | Lauris Kaplinski <lauris@src.gnome.org> | 2002-03-10 15:04:22 +0000 |
|---|---|---|
| committer | Lauris Kaplinski <lauris@src.gnome.org> | 2002-03-10 15:04:22 +0000 |
| commit | 0335c74339ba706543b47eadf5800ebbd8abd99b (patch) | |
| tree | ddee5463c83f4a7587ddfe8f17b8e9dd295c1774 | |
| parent | ed6922aae02cbdc5bf768c5c1f35bd5c1ea09833 (diff) | |
| download | gnome-control-center-NAUTILUS_1_1_9.tar.gz | |
Fixed carsh on keypresses in icon view, added item activation on enterNAUTILUS_1_1_9
| -rw-r--r-- | capplets/mouse/gnome-mouse-properties.c | 1 | ||||
| -rw-r--r-- | control-center/capplet-dir-view-list.c | 16 | ||||
| -rw-r--r-- | libbackground/applier.c | 4 |
3 files changed, 18 insertions, 3 deletions
diff --git a/capplets/mouse/gnome-mouse-properties.c b/capplets/mouse/gnome-mouse-properties.c index a33fbc7b7..c2b17c1ef 100644 --- a/capplets/mouse/gnome-mouse-properties.c +++ b/capplets/mouse/gnome-mouse-properties.c @@ -27,6 +27,7 @@ # include <config.h> #endif +#include <string.h> #include <gnome.h> #include <gconf/gconf-client.h> #include <glade/glade.h> diff --git a/control-center/capplet-dir-view-list.c b/control-center/capplet-dir-view-list.c index 26c7d4a3d..bbfd92672 100644 --- a/control-center/capplet-dir-view-list.c +++ b/control-center/capplet-dir-view-list.c @@ -331,7 +331,7 @@ static void select_icon_list_cb (GtkWidget *widget, gint arg1, GdkEvent *event, CappletDirView *view) { - if (event->type == GDK_2BUTTON_PRESS && + if (event && event->type == GDK_2BUTTON_PRESS && ((GdkEventButton *) event)->button == 1) { capplet_dir_entry_activate @@ -342,6 +342,17 @@ select_icon_list_cb (GtkWidget *widget, gint arg1, GdkEvent *event, } } +static gboolean +cdvl_key_press (GtkWidget *widget, GdkEventKey *event, CappletDirView *view) +{ + if ((event->keyval == GDK_Return) && (view->selected)) { + capplet_dir_entry_activate (view->selected, view); + return TRUE; + } + + return FALSE; +} + void lighten_color (GdkColor *color) { @@ -510,6 +521,9 @@ list_create (CappletDirView *view) (GCallback) select_icon_list_cb, view); + g_signal_connect (G_OBJECT (w), "key_press_event", + G_CALLBACK (cdvl_key_press), view); + gtk_container_add (GTK_CONTAINER (sw), w); gtk_paned_add2 (GTK_PANED (hbox), sw); gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0); diff --git a/libbackground/applier.c b/libbackground/applier.c index a2848f0fd..8d514910b 100644 --- a/libbackground/applier.c +++ b/libbackground/applier.c @@ -824,8 +824,8 @@ render_to_screen (BGApplier *bg_applier, const BGPreferences *prefs) bg_applier->p->render_geom.height); } else if (bg_applier->p->type == BG_APPLIER_ROOT) { - gdk_window_set_back_pixmap (GDK_ROOT_PARENT (), NULL, FALSE); - gdk_window_set_background (GDK_ROOT_PARENT (), prefs->color1); + gdk_window_set_back_pixmap (gdk_get_default_root_window (), NULL, FALSE); + gdk_window_set_background (gdk_get_default_root_window (), prefs->color1); } } } |