headers = TNY_LIST (tny_gtk_header_list_model_new ());
tny_gtk_header_list_model_set_folder (TNY_GTK_HEADER_LIST_MODEL(headers),
- folder, FALSE);
+ folder, FALSE, NULL, NULL, NULL);
/* Add IDLE observer (monitor) and another folder observer for
new messages (self) */
/* Drag and drop stuff */
static void
-drag_data_get_cb (GtkWidget *widget, GdkDragContext *context,
+drag_data_get_cb (GtkWidget *widget,
+ GdkDragContext *context,
GtkSelectionData *selection_data,
- guint info, guint time, gpointer data)
+ guint info,
+ guint time,
+ gpointer data)
{
- GtkTreeModel *model = NULL;
- GtkTreeIter iter;
- GtkTreePath *source_row = NULL;
-/* GtkTreeSelection *sel = NULL;*/
-
- source_row = get_selected_row (GTK_TREE_VIEW (widget), &model);
-
- if ((source_row == NULL) || (!gtk_tree_model_get_iter(model, &iter, source_row))) return;
+ GtkTreeSelection *selection;
+ GtkTreeModel *model;
+ GList *selected_rows;
- switch (info) {
- case MODEST_HEADER_ROW:
- gtk_tree_set_row_drag_data (selection_data, model, source_row);
- break;
- case MODEST_MSG: {
- TnyHeader *hdr = NULL;
- gtk_tree_model_get (model, &iter,
- TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &hdr,
- -1);
- if (hdr) {
- g_object_unref (G_OBJECT(hdr));
- }
- break;
- }
- default:
- g_message ("%s: default switch case.", __FUNCTION__);
- }
+ /* Get selected rows */
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget));
+ selected_rows = gtk_tree_selection_get_selected_rows (selection, &model);
- /* commenting out the next, fixes NB#62963 */
-#if 0
- /* Set focus on next header */
- sel = gtk_tree_view_get_selection(GTK_TREE_VIEW (widget));
- gtk_tree_path_next (source_row);
- gtk_tree_selection_select_path (sel, source_row);
+ /* Set the data */
+ modest_dnd_selection_data_set_paths (selection_data, selected_rows);
- gtk_tree_path_free (source_row);
-#endif
+ /* Frees */
+ g_list_foreach (selected_rows, (GFunc) gtk_tree_path_free, NULL);
+ g_list_free (selected_rows);
}
/* Header view drag types */
const GtkTargetEntry header_view_drag_types[] = {
- { "GTK_TREE_MODEL_ROW", GTK_TARGET_SAME_APP, MODEST_HEADER_ROW },
- { "text/uri-list", 0, MODEST_MSG },
+ { GTK_TREE_PATH_AS_STRING_LIST, GTK_TARGET_SAME_APP, MODEST_HEADER_ROW }
};
static void
}
static void
-idle_notify_headers_count_changed_destroy (gpointer data)
-{
- HeadersCountChangedHelper *helper = NULL;
-
- g_return_if_fail (data != NULL);
- helper = (HeadersCountChangedHelper *) data;
-
- g_object_unref (helper->change);
- g_slice_free (HeadersCountChangedHelper, helper);
-}
-
-static gboolean
-idle_notify_headers_count_changed (gpointer data)
-{
- TnyFolder *folder = NULL;
- ModestHeaderViewPrivate *priv = NULL;
- HeadersCountChangedHelper *helper = NULL;
-
- g_return_val_if_fail (data != NULL, FALSE);
- helper = (HeadersCountChangedHelper *) data;
- g_return_val_if_fail (MODEST_IS_HEADER_VIEW(helper->self), FALSE);
- g_return_val_if_fail (TNY_FOLDER_CHANGE(helper->change), FALSE);
-
- folder = tny_folder_change_get_folder (helper->change);
-
- priv = MODEST_HEADER_VIEW_GET_PRIVATE (helper->self);
-
- g_mutex_lock (priv->observers_lock);
-
- /* Emit signal to evaluate how headers changes affects to the window view */
- g_signal_emit (G_OBJECT(helper->self),
- signals[MSG_COUNT_CHANGED_SIGNAL],
- 0, folder, helper->change);
-
- /* Added or removed headers, so data stored on cliboard are invalid */
- if (modest_email_clipboard_check_source_folder (priv->clipboard, folder))
- modest_email_clipboard_clear (priv->clipboard);
-
- g_mutex_unlock (priv->observers_lock);
-
- return FALSE;
-}
-
-static void
folder_monitor_update (TnyFolderObserver *self,
TnyFolderChange *change)
{
ModestHeaderViewPrivate *priv = NULL;
TnyFolderChangeChanged changed;
- HeadersCountChangedHelper *helper = NULL;
+ TnyFolder *folder = NULL;
changed = tny_folder_change_get_changed (change);
view has changed before this call to the observer
happens */
priv = MODEST_HEADER_VIEW_GET_PRIVATE (MODEST_HEADER_VIEW (self));
- if (tny_folder_change_get_folder (change) != priv->folder)
- return;
+ folder = tny_folder_change_get_folder (change);
+ if (folder != priv->folder)
+ goto frees;
/* Check folder count */
if ((changed & TNY_FOLDER_CHANGE_CHANGED_ADDED_HEADERS) ||
(changed & TNY_FOLDER_CHANGE_CHANGED_EXPUNGED_HEADERS)) {
- helper = g_slice_new0 (HeadersCountChangedHelper);
- helper->self = MODEST_HEADER_VIEW(self);
- helper->change = g_object_ref(change);
-
- idle_notify_headers_count_changed (helper);
- idle_notify_headers_count_changed_destroy (helper);
-
-/* I changed this because it's not necessary anymore: all updates of
- * observers in Tinymail happen guaranteed on the Mainloop already.
- * Your friend, Philip
- *
- * g_idle_add_full (G_PRIORITY_DEFAULT,
- * idle_notify_headers_count_changed,
- * helper,
- * idle_notify_headers_count_changed_destroy);
- */
+ g_mutex_lock (priv->observers_lock);
+
+ /* Emit signal to evaluate how headers changes affects
+ to the window view */
+ g_signal_emit (G_OBJECT(self),
+ signals[MSG_COUNT_CHANGED_SIGNAL],
+ 0, folder, change);
+
+ /* Added or removed headers, so data stored on cliboard are invalid */
+ if (modest_email_clipboard_check_source_folder (priv->clipboard, folder))
+ modest_email_clipboard_clear (priv->clipboard);
+
+ g_mutex_unlock (priv->observers_lock);
}
+
+ /* Free */
+ frees:
+ if (folder != NULL)
+ g_object_unref (folder);
}
gboolean
g_return_if_fail (MODEST_IS_HEADER_VIEW (header_view));
priv = MODEST_HEADER_VIEW_GET_PRIVATE(header_view);
- priv->status = HEADER_VIEW_EMPTY;
-
/* Hide cut headers */
model = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view));
- if (GTK_IS_TREE_MODEL_FILTER (model))
+ if (GTK_IS_TREE_MODEL_FILTER (model)) {
+ priv->status = 0;
gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model));
+ }
}
/*
if (TNY_IS_TRANSPORT_ACCOUNT (account))
return;
- g_print ("--------------------- HEADER ---------------\n");
-
priv = MODEST_HEADER_VIEW_GET_PRIVATE (user_data);
if (priv->folder) {
g_mutex_unlock(priv->observer_list_lock);
}
-void modest_header_view_remove_observer(
- ModestHeaderView *header_view,
- ModestHeaderViewObserver *observer)
+void
+modest_header_view_remove_observer(ModestHeaderView *header_view,
+ ModestHeaderViewObserver *observer)
{
ModestHeaderViewPrivate *priv = NULL;
g_mutex_unlock(priv->observer_list_lock);
}
-static void modest_header_view_notify_observers(
- ModestHeaderView *header_view,
- GtkTreeModel *model,
- const gchar *tny_folder_id)
+static void
+modest_header_view_notify_observers(ModestHeaderView *header_view,
+ GtkTreeModel *model,
+ const gchar *tny_folder_id)
{
ModestHeaderViewPrivate *priv = NULL;
GSList *iter;
projects / modest / blobdiff