Drop unused variables.

[geeqie.git] / src / view_file_icon.c

diff --git a/src/view_file_icon.c b/src/view_file_icon.c
index acf07d4..b11a9db 100644 (file)
--- a/src/view_file_icon.c
+++ b/src/view_file_icon.c
@@ -99,7 +99,7 @@ static gint iconlist_read(FileData *dir_fd, GList **list)
                IconData *id;
 
                fd = work->data;
-               g_assert(fd->magick == 0x12345678);
+               g_assert(fd->magick == FD_MAGICK);
                id = g_new0(IconData, 1);
 
                id->selected = SELECTION_NONE;
@@ -433,11 +433,7 @@ static void tip_show(ViewFile *vf)
 
        gdk_window_get_pointer(NULL, &x, &y, NULL);
 
-#if GTK_CHECK_VERSION(2,20,0)
        if (!gtk_widget_get_realized(VFICON(vf)->tip_window)) gtk_widget_realize(VFICON(vf)->tip_window);
-#else
-       if (!GTK_WIDGET_REALIZED(VFICON(vf)->tip_window)) gtk_widget_realize(VFICON(vf)->tip_window);
-#endif
        gtk_window_move(GTK_WINDOW(VFICON(vf)->tip_window), x + 16, y + 16);
        gtk_widget_show(VFICON(vf)->tip_window);
 }
@@ -457,11 +453,7 @@ static gboolean tip_schedule_cb(gpointer data)
 
        window = gtk_widget_get_toplevel(vf->listview);
 
-#if GTK_CHECK_VERSION(2,20,0)
        if (gtk_widget_get_sensitive(window) &&
-#else
-       if (GTK_WIDGET_SENSITIVE(window) &&
-#endif
            gtk_window_has_toplevel_focus(GTK_WINDOW(window)))
                {
                tip_show(vf);
@@ -542,8 +534,6 @@ static void vficon_dnd_get(GtkWidget *widget, GdkDragContext *context,
 {
        ViewFile *vf = data;
        GList *list = NULL;
-       gchar *uri_text = NULL;
-       gint total;
 
        if (!VFICON(vf)->click_id) return;
 
@@ -903,7 +893,7 @@ guint vficon_selection_count(ViewFile *vf, gint64 *bytes)
                        {
                        IconData *id = work->data;
                        FileData *fd = id->fd;
-                       g_assert(fd->magick == 0x12345678);
+                       g_assert(fd->magick == FD_MAGICK);
                        b += fd->size;
 
                        work = work->next;
@@ -925,7 +915,7 @@ GList *vficon_selection_get_list(ViewFile *vf)
                {
                IconData *id = work->data;
                FileData *fd = id->fd;
-               g_assert(fd->magick == 0x12345678);
+               g_assert(fd->magick == FD_MAGICK);
 
                list = g_list_prepend(list, file_data_ref(fd));
                
@@ -1003,7 +993,7 @@ void vficon_mark_to_selection(ViewFile *vf, gint mark, MarkToSelectionMode mode)
                FileData *fd = id->fd;
                gboolean mark_val, selected;
 
-               g_assert(fd->magick == 0x12345678);
+               g_assert(fd->magick == FD_MAGICK);
 
                mark_val = file_data_get_mark(fd, n);
                selected = (id->selected & SELECTION_SELECTED);
@@ -1446,11 +1436,7 @@ gboolean vficon_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer dat
        switch (bevent->button)
                {
                case MOUSE_BUTTON_LEFT:
-#if GTK_CHECK_VERSION(2,20,0)
                        if (!gtk_widget_has_focus(vf->listview))
-#else
-                       if (!GTK_WIDGET_HAS_FOCUS(vf->listview))
-#endif
                                {
                                gtk_widget_grab_focus(vf->listview);
                                }
@@ -1569,6 +1555,10 @@ static gboolean vficon_destroy_node_cb(GtkTreeModel *store, GtkTreePath *tpath,
        GList *list;
 
        gtk_tree_model_get(store, iter, FILE_COLUMN_POINTER, &list, -1);
+       
+       /* it seems that gtk_list_store_clear may call some callbacks
+          that use the column. Set the pointer to NULL to be safe. */
+       gtk_list_store_set(GTK_LIST_STORE(store), iter, FILE_COLUMN_POINTER, NULL, -1);
        g_list_free(list);
 
        return FALSE;
@@ -1613,11 +1603,7 @@ static void vficon_populate(ViewFile *vf, gboolean resize, gboolean keep_positio
 
        store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview));
 
-#if GTK_CHECK_VERSION(2,20,0)
        if (keep_position && gtk_widget_get_realized(vf->listview) &&
-#else
-       if (keep_position && GTK_WIDGET_REALIZED(vf->listview) &&
-#endif
            gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(vf->listview), 0, 0, &tpath, NULL, NULL, NULL))
                {
                GtkTreeIter iter;
@@ -1650,11 +1636,7 @@ static void vficon_populate(ViewFile *vf, gboolean resize, gboolean keep_positio
                        gtk_tree_view_column_set_visible(column, (i < VFICON(vf)->columns));
                        gtk_tree_view_column_set_fixed_width(column, thumb_width + (THUMB_BORDER_PADDING * 6));
 
-#if GTK_CHECK_VERSION(2,18,0)
                        list = gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(column));
-#else
-                       list = gtk_tree_view_column_get_cell_renderers(column);
-#endif
                        cell = (list) ? list->data : NULL;
                        g_list_free(list);
 
@@ -1668,11 +1650,7 @@ static void vficon_populate(ViewFile *vf, gboolean resize, gboolean keep_positio
                                                             NULL);
                                }
                        }
-#if GTK_CHECK_VERSION(2,20,0)
                if (gtk_widget_get_realized(vf->listview)) gtk_tree_view_columns_autosize(GTK_TREE_VIEW(vf->listview));
-#else
-               if (GTK_WIDGET_REALIZED(vf->listview)) gtk_tree_view_columns_autosize(GTK_TREE_VIEW(vf->listview));
-#endif
                }
 
        r = -1;
@@ -2183,7 +2161,7 @@ static void vficon_cell_data_cb(GtkTreeViewColumn *tree_column, GtkCellRenderer
                gchar *link;
                GtkStateType state = GTK_STATE_NORMAL;
 
-               g_assert(id->fd->magick == 0x12345678);
+               g_assert(id->fd->magick == FD_MAGICK);
 
                link = islink(id->fd->path) ? GQ_LINK_STR : "";
                if (id->fd->sidecar_files)