Drop unused variables.

[geeqie.git] / src / collect.c

diff --git a/src/collect.c b/src/collect.c
index 71ff8c1..4f76ca8 100644 (file)
--- a/src/collect.c
+++ b/src/collect.c
@@ -817,7 +817,6 @@ static gboolean collection_window_keypress(GtkWidget *widget, GdkEventKey *event
 {
        CollectWindow *cw = data;
        gboolean stop_signal = FALSE;
-       gint edit_val = -1;
        GList *list;
 
        if (event->state & GDK_CONTROL_MASK)
@@ -826,34 +825,15 @@ static gboolean collection_window_keypress(GtkWidget *widget, GdkEventKey *event
                switch (event->keyval)
                        {
                        case '1':
-                               edit_val = 0;
-                               break;
                        case '2':
-                               edit_val = 1;
-                               break;
                        case '3':
-                               edit_val = 2;
-                               break;
                        case '4':
-                               edit_val = 3;
-                               break;
                        case '5':
-                               edit_val = 4;
-                               break;
                        case '6':
-                               edit_val = 5;
-                               break;
                        case '7':
-                               edit_val = 6;
-                               break;
                        case '8':
-                               edit_val = 7;
-                               break;
                        case '9':
-                               edit_val = 8;
-                               break;
                        case '0':
-                               edit_val = 9;
                                break;
                        case 'A': case 'a':
                                if (event->state & GDK_SHIFT_MASK)
@@ -901,7 +881,7 @@ static gboolean collection_window_keypress(GtkWidget *widget, GdkEventKey *event
                stop_signal = TRUE;
                switch (event->keyval)
                        {
-                       case GDK_Return: case GDK_KP_Enter:
+                       case GDK_KEY_Return: case GDK_KEY_KP_Enter:
                                layout_image_set_collection(NULL, cw->cd,
                                        collection_table_get_focus_info(cw->table));
                                break;
@@ -951,7 +931,7 @@ static gboolean collection_window_keypress(GtkWidget *widget, GdkEventKey *event
                                        collection_set_sort_method(cw->cd, SORT_PATH);
                                        }
                                break;
-                       case GDK_Delete: case GDK_KP_Delete:
+                       case GDK_KEY_Delete: case GDK_KEY_KP_Delete:
                                list = g_list_copy(cw->table->selection);
                                if (list)
                                        {
@@ -979,12 +959,15 @@ static gboolean collection_window_keypress(GtkWidget *widget, GdkEventKey *event
 static void collection_window_get_geometry(CollectWindow *cw)
 {
        CollectionData *cd;
+       GdkWindow *window;
 
        if (!cw) return;
 
        cd = cw->cd;
-       gdk_window_get_position(cw->window->window, &cd->window_x, &cd->window_y);
-       gdk_drawable_get_size(cw->window->window, &cd->window_w, &cd->window_h);
+       window = gtk_widget_get_window(cw->window);
+       gdk_window_get_position(window, &cd->window_x, &cd->window_y);
+       cd->window_w = gdk_window_get_width(window);
+       cd->window_h = gdk_window_get_height(window);
        cd->window_read = TRUE;
 }