* Fixed a compilation warning

[modest] / src / widgets / modest-attachments-view.c

diff --git a/src/widgets/modest-attachments-view.c b/src/widgets/modest-attachments-view.c
index d144c37..90eb51e 100644 (file)
--- a/src/widgets/modest-attachments-view.c
+++ b/src/widgets/modest-attachments-view.c
@@ -46,6 +46,7 @@ static GObjectClass *parent_class = NULL;
 /* signals */
 enum {
        ACTIVATE_SIGNAL,
+       DELETE_SIGNAL,
        LAST_SIGNAL
 };
 
@@ -75,7 +76,6 @@ static void set_selected (ModestAttachmentsView *atts_view, ModestAttachmentView
 static void select_range (ModestAttachmentsView *atts_view, ModestAttachmentView *att1, ModestAttachmentView *att2);
 static void clipboard_get (GtkClipboard *clipboard, GtkSelectionData *selection_data,
                           guint info, gpointer userdata);
-static void clipboard_clear (GtkClipboard *clipboard, gpointer userdata);
 static void own_clipboard (ModestAttachmentsView *atts_view);
 
 static guint signals[LAST_SIGNAL] = {0};
@@ -355,6 +355,15 @@ modest_attachments_view_class_init (ModestAttachmentsViewClass *klass)
                              g_cclosure_marshal_VOID__OBJECT,
                              G_TYPE_NONE, 1, G_TYPE_OBJECT);
        
+       signals[DELETE_SIGNAL] =
+               g_signal_new ("delete",
+                             G_TYPE_FROM_CLASS (object_class),
+                             G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+                             G_STRUCT_OFFSET(ModestAttachmentsViewClass, delete),
+                             NULL, NULL,
+                             g_cclosure_marshal_VOID__VOID,
+                             G_TYPE_NONE, 0);
+
        return;
 }
 
@@ -419,6 +428,7 @@ button_press_event (GtkWidget *widget,
                                        priv->rubber_start = att_view;
                                        gtk_grab_add (widget);
                                }
+                               g_object_unref (mime_part);
                        }
                }
        }
@@ -505,6 +515,7 @@ find_prev_or_next_not_purged (GList *list, gboolean prev, gboolean include_this)
                                tmp = g_list_next (tmp);
                        is_valid = FALSE;
                }
+               g_object_unref (mime_part);
        } while (!is_valid && tmp);
 
        return tmp;
@@ -609,6 +620,11 @@ key_press_event (GtkWidget *widget,
                return TRUE;
        }
 
+       if (event->keyval == GDK_BackSpace) {
+               g_signal_emit (G_OBJECT (widget), signals[DELETE_SIGNAL], 0);
+               return TRUE;
+       }
+
        /* Activates selected item */
        if (g_list_length (priv->selected) == 1) {
                ModestAttachmentView *att_view = (ModestAttachmentView *) priv->selected->data;
@@ -773,13 +789,6 @@ static void clipboard_get (GtkClipboard *clipboard, GtkSelectionData *selection_
        }
 }
 
-static void clipboard_clear (GtkClipboard *clipboard, gpointer userdata)
-{
-       ModestAttachmentsView *atts_view = (ModestAttachmentsView *) userdata;
-
-       unselect_all (atts_view);
-}
-
 TnyList *
 modest_attachments_view_get_selection (ModestAttachmentsView *atts_view)
 {
@@ -847,6 +856,7 @@ modest_attachments_view_select_all (ModestAttachmentsView *atts_view)
                        gtk_widget_set_state (GTK_WIDGET (node->data), GTK_STATE_SELECTED);
                        priv->selected = g_list_append (priv->selected, node->data);
                }
+               g_object_unref (mime_part);
        }
        g_list_free (children);
 
@@ -916,7 +926,7 @@ own_clipboard (ModestAttachmentsView *atts_view)
 
        gtk_clipboard_set_with_owner (gtk_widget_get_clipboard (GTK_WIDGET (atts_view), GDK_SELECTION_PRIMARY),
                                      targets, G_N_ELEMENTS (targets),
-                                     clipboard_get, clipboard_clear, G_OBJECT(atts_view));
+                                     clipboard_get, NULL, G_OBJECT(atts_view));
                              
 }