diff options
| -rw-r--r-- | mail/ChangeLog | 6 | ||||
| -rw-r--r-- | mail/em-folder-tree.c | 5 | ||||
| -rw-r--r-- | mail/mail-session.c | 10 |
3 files changed, 13 insertions, 8 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 665df638aa..78687b5004 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,11 @@ 2004-01-27 Jeffrey Stedfast <fejj@ximian.com> + * em-folder-tree.c (tree_drag_data_received): Use + gtk_tree_view_get_dest_row_at_pos() instead of + gtk_tree_view_get_path_at_pos() since this is what Nautilus + uses. Unfortunately, it still gives us back the wrong GtkTreePath + so it looks to me like Gtk+ is borked. + * em-migrate.c (em_migrate_imap_caches_1_4): Copy the imap cache into the right place. Duh. diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index 62b3deba2a..43012b3453 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -566,8 +566,7 @@ tree_drag_data_received (GtkWidget *widget, GdkDragContext *context, int x, int guint info, guint time, EMFolderTree *emft) { struct _EMFolderTreePrivate *priv = emft->priv; - GtkTreeViewColumn *column; - int cell_x, cell_y; + GtkTreeViewDropPosition pos; GtkTreePath *path; gboolean success; gboolean moved; @@ -575,7 +574,7 @@ tree_drag_data_received (GtkWidget *widget, GdkDragContext *context, int x, int printf ("::drag-data-received called\n"); - if (!gtk_tree_view_get_path_at_pos (priv->treeview, x, y, &path, &column, &cell_x, &cell_y)) + if (!gtk_tree_view_get_dest_row_at_pos (priv->treeview, x, y, &path, &pos)) return; move = context->action == GDK_ACTION_MOVE; diff --git a/mail/mail-session.c b/mail/mail-session.c index f9e22a739f..5a93eab803 100644 --- a/mail/mail-session.c +++ b/mail/mail-session.c @@ -640,15 +640,15 @@ main_get_filter_driver (CamelSession *session, const char *type, CamelException camel_filter_driver_add_rule (driver, "Junk check", "(junk-test)", "(begin (set-system-flag \"junk\"))"); } - if (strcmp (type, FILTER_SOURCE_JUNKTEST)) { + if (strcmp (type, FILTER_SOURCE_JUNKTEST) != 0) { GString *fsearch, *faction; - + fsearch = g_string_new (""); faction = g_string_new (""); - + if (!strcmp (type, FILTER_SOURCE_DEMAND)) type = FILTER_SOURCE_INCOMING; - + /* add the user-defined rules next */ while ((rule = rule_context_next_rule (fc, rule, type))) { g_string_truncate (fsearch, 0); @@ -658,7 +658,7 @@ main_get_filter_driver (CamelSession *session, const char *type, CamelException filter_filter_build_action ((FilterFilter *) rule, faction); camel_filter_driver_add_rule (driver, rule->name, fsearch->str, faction->str); } - + g_string_free (fsearch, TRUE); g_string_free (faction, TRUE); } |