[evolution/gnome-3-10] EMFolderTreeModel: Declare the CamelStore column as an object type.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/gnome-3-10] EMFolderTreeModel: Declare the CamelStore column as an object type.
- Date: Sun, 17 Nov 2013 00:25:06 +0000 (UTC)
commit 506e730dbd74dd5f45c6aab236358d2dd53ff84b
Author: Matthew Barnes <mbarnes redhat com>
Date: Sat Nov 16 17:49:52 2013 -0500
EMFolderTreeModel: Declare the CamelStore column as an object type.
Declaring the CamelStore column as a raw pointer type dates back to
before Camel was GObject-based. The problem is the CamelStore could
be finalized while the tree model still has a pointer to it, leaving
behind dangling pointers in the tree model which could cause a crash.
Declaring the column type in the column enum turned out to be a good
idea, as it makes code that needs updated easy to find. This renames
the enum value from COL_POINTER_CAMEL_STORE to COL_OBJECT_CAMEL_STORE.
(cherry picked from commit c134c41bcdd826228f697c11ab4b375b65bd97fa)
mail/e-mail-sidebar.c | 15 ++++--
mail/em-folder-tree-model.c | 39 +++++++++--------
mail/em-folder-tree-model.h | 2 +-
mail/em-folder-tree.c | 96 +++++++++++++++++++++++++++----------------
mail/em-folder-utils.c | 3 +-
5 files changed, 95 insertions(+), 60 deletions(-)
---
diff --git a/mail/e-mail-sidebar.c b/mail/e-mail-sidebar.c
index 20cf414..9c2a289 100644
--- a/mail/e-mail-sidebar.c
+++ b/mail/e-mail-sidebar.c
@@ -111,7 +111,7 @@ mail_sidebar_model_loaded_row_cb (GtkTreeModel *model,
gtk_tree_model_get (
model, iter,
- COL_POINTER_CAMEL_STORE, &store,
+ COL_OBJECT_CAMEL_STORE, &store,
COL_STRING_FULL_NAME, &folder_name,
COL_BOOL_IS_STORE, &is_store,
COL_BOOL_IS_FOLDER, &is_folder, -1);
@@ -143,6 +143,7 @@ mail_sidebar_model_loaded_row_cb (GtkTreeModel *model,
g_free (group_name);
g_free (folder_name);
+ g_clear_object (&store);
}
static void
@@ -166,13 +167,14 @@ mail_sidebar_selection_changed_cb (GtkTreeSelection *selection,
gtk_tree_model_get (
model, &iter,
- COL_POINTER_CAMEL_STORE, &store,
+ COL_OBJECT_CAMEL_STORE, &store,
COL_STRING_FULL_NAME, &folder_name, -1);
if (CAMEL_IS_STORE (store) && folder_name != NULL)
uri = e_mail_folder_uri_build (store, folder_name);
g_free (folder_name);
+ g_clear_object (&store);
}
if (uri != NULL)
@@ -322,7 +324,7 @@ mail_sidebar_row_expanded (GtkTreeView *tree_view,
gtk_tree_model_get (
model, &iter,
- COL_POINTER_CAMEL_STORE, &store,
+ COL_OBJECT_CAMEL_STORE, &store,
COL_STRING_FULL_NAME, &folder_name,
COL_BOOL_IS_STORE, &is_store,
COL_BOOL_IS_FOLDER, &is_folder, -1);
@@ -348,6 +350,7 @@ mail_sidebar_row_expanded (GtkTreeView *tree_view,
g_free (group_name);
g_free (folder_name);
+ g_clear_object (&store);
gtk_tree_path_up (path);
}
@@ -381,7 +384,7 @@ mail_sidebar_row_collapsed (GtkTreeView *tree_view,
gtk_tree_model_get (
model, iter,
- COL_POINTER_CAMEL_STORE, &store,
+ COL_OBJECT_CAMEL_STORE, &store,
COL_STRING_FULL_NAME, &folder_name,
COL_BOOL_IS_STORE, &is_store,
COL_BOOL_IS_FOLDER, &is_folder, -1);
@@ -407,6 +410,7 @@ mail_sidebar_row_collapsed (GtkTreeView *tree_view,
g_free (group_name);
g_free (folder_name);
+ g_clear_object (&store);
}
static guint32
@@ -440,7 +444,7 @@ mail_sidebar_check_state (EMailSidebar *sidebar)
gtk_tree_model_get (
model, &iter,
- COL_POINTER_CAMEL_STORE, &store,
+ COL_OBJECT_CAMEL_STORE, &store,
COL_STRING_FULL_NAME, &full_name,
COL_BOOL_IS_STORE, &is_store,
COL_UINT_FLAGS, &folder_flags, -1);
@@ -537,6 +541,7 @@ mail_sidebar_check_state (EMailSidebar *sidebar)
state |= E_MAIL_SIDEBAR_STORE_CAN_BE_DISABLED;
g_free (full_name);
+ g_clear_object (&store);
return state;
}
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index a7039f2..0e3bb88 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -150,7 +150,7 @@ folder_tree_model_sort (GtkTreeModel *model,
gtk_tree_model_get (
model, a,
COL_BOOL_IS_STORE, &a_is_store,
- COL_POINTER_CAMEL_STORE, &service_a,
+ COL_OBJECT_CAMEL_STORE, &service_a,
COL_STRING_DISPLAY_NAME, &aname,
COL_UINT_FLAGS, &flags_a,
-1);
@@ -158,7 +158,7 @@ folder_tree_model_sort (GtkTreeModel *model,
gtk_tree_model_get (
model, b,
COL_BOOL_IS_STORE, &b_is_store,
- COL_POINTER_CAMEL_STORE, &service_b,
+ COL_OBJECT_CAMEL_STORE, &service_b,
COL_STRING_DISPLAY_NAME, &bname,
COL_UINT_FLAGS, &flags_b,
-1);
@@ -200,6 +200,9 @@ folder_tree_model_sort (GtkTreeModel *model,
g_free (aname);
g_free (bname);
+ g_clear_object (&service_a);
+ g_clear_object (&service_b);
+
return rv;
}
@@ -345,18 +348,18 @@ static void
folder_tree_model_constructed (GObject *object)
{
GType col_types[] = {
- G_TYPE_STRING, /* display name */
- G_TYPE_POINTER, /* store object */
- G_TYPE_STRING, /* full name */
- G_TYPE_STRING, /* icon name */
- G_TYPE_UINT, /* unread count */
- G_TYPE_UINT, /* flags */
- G_TYPE_BOOLEAN, /* is a store node */
- G_TYPE_BOOLEAN, /* is a folder node */
- G_TYPE_BOOLEAN, /* has not-yet-loaded subfolders */
- G_TYPE_UINT, /* last known unread count */
- G_TYPE_BOOLEAN, /* folder is a draft folder */
- G_TYPE_UINT /* user's sortorder */
+ G_TYPE_STRING, /* display name */
+ CAMEL_TYPE_STORE, /* CamelStore */
+ G_TYPE_STRING, /* full name */
+ G_TYPE_STRING, /* icon name */
+ G_TYPE_UINT, /* unread count */
+ G_TYPE_UINT, /* flags */
+ G_TYPE_BOOLEAN, /* is a store node */
+ G_TYPE_BOOLEAN, /* is a folder node */
+ G_TYPE_BOOLEAN, /* has not-yet-loaded subfolders */
+ G_TYPE_UINT, /* last known unread count */
+ G_TYPE_BOOLEAN, /* folder is a draft folder */
+ G_TYPE_UINT /* user's sortorder */
};
gtk_tree_store_set_column_types (
@@ -836,7 +839,7 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model,
gtk_tree_store_set (
tree_store, iter,
COL_STRING_DISPLAY_NAME, display_name,
- COL_POINTER_CAMEL_STORE, si->store,
+ COL_OBJECT_CAMEL_STORE, si->store,
COL_STRING_FULL_NAME, fi->full_name,
COL_STRING_ICON_NAME, icon_name,
COL_UINT_FLAGS, flags,
@@ -868,7 +871,7 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model,
gtk_tree_store_set (
tree_store, &sub,
COL_STRING_DISPLAY_NAME, _("Loading..."),
- COL_POINTER_CAMEL_STORE, si->store,
+ COL_OBJECT_CAMEL_STORE, si->store,
COL_STRING_FULL_NAME, NULL,
COL_STRING_ICON_NAME, NULL,
COL_BOOL_LOAD_SUBDIRS, FALSE,
@@ -1136,7 +1139,7 @@ em_folder_tree_model_add_store (EMFolderTreeModel *model,
gtk_tree_store_set (
tree_store, &iter,
COL_STRING_DISPLAY_NAME, display_name,
- COL_POINTER_CAMEL_STORE, store,
+ COL_OBJECT_CAMEL_STORE, store,
COL_STRING_FULL_NAME, NULL,
COL_BOOL_LOAD_SUBDIRS, TRUE,
COL_BOOL_IS_STORE, TRUE,
@@ -1163,7 +1166,7 @@ em_folder_tree_model_add_store (EMFolderTreeModel *model,
gtk_tree_store_set (
tree_store, &iter,
COL_STRING_DISPLAY_NAME, _("Loading..."),
- COL_POINTER_CAMEL_STORE, store,
+ COL_OBJECT_CAMEL_STORE, store,
COL_STRING_FULL_NAME, NULL,
COL_BOOL_LOAD_SUBDIRS, FALSE,
COL_BOOL_IS_STORE, FALSE,
diff --git a/mail/em-folder-tree-model.h b/mail/em-folder-tree-model.h
index af8acd7..c110cc5 100644
--- a/mail/em-folder-tree-model.h
+++ b/mail/em-folder-tree-model.h
@@ -56,7 +56,7 @@ typedef struct _EMFolderTreeModelStoreInfo EMFolderTreeModelStoreInfo;
enum {
COL_STRING_DISPLAY_NAME, /* string that appears in the tree */
- COL_POINTER_CAMEL_STORE, /* CamelStore object */
+ COL_OBJECT_CAMEL_STORE, /* CamelStore object */
COL_STRING_FULL_NAME, /* if node is a folder, the full path
* name of the folder, no leading / */
COL_STRING_ICON_NAME, /* icon name for the folder */
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 965a1ab..b15041a 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -555,10 +555,11 @@ folder_tree_maybe_expand_row (EMFolderTreeModel *model,
gtk_tree_model_get (
GTK_TREE_MODEL (model), iter,
COL_STRING_FULL_NAME, &full_name,
- COL_POINTER_CAMEL_STORE, &store, -1);
+ COL_OBJECT_CAMEL_STORE, &store, -1);
uid = camel_service_get_uid (CAMEL_SERVICE (store));
key = g_strdup_printf ("%s/%s", uid, full_name ? full_name : "");
+ g_object_unref (store);
u = g_hash_table_lookup (priv->select_uris_table, key);
if (u) {
@@ -622,11 +623,17 @@ folder_tree_cell_edited_cb (EMFolderTree *folder_tree,
gtk_tree_model_get (
model, &iter,
- COL_POINTER_CAMEL_STORE, &store,
+ COL_OBJECT_CAMEL_STORE, &store,
COL_STRING_DISPLAY_NAME, &old_name,
COL_STRING_FULL_NAME, &old_full_name, -1);
- if (!old_name || !old_full_name || g_strcmp0 (new_name, old_name) == 0)
+ if (old_name == NULL)
+ goto exit;
+
+ if (old_full_name == NULL)
+ goto exit;
+
+ if (g_strcmp0 (new_name, old_name) == 0)
goto exit;
/* Check for invalid characters. */
@@ -676,11 +683,11 @@ folder_tree_cell_edited_cb (EMFolderTree *folder_tree,
em_folder_tree_set_selected (folder_tree, folder_uri, FALSE);
g_free (folder_uri);
- exit:
-
+exit:
g_free (old_name);
g_free (old_full_name);
g_free (new_full_name);
+ g_clear_object (&store);
}
static gboolean
@@ -722,7 +729,7 @@ folder_tree_render_display_name (GtkTreeViewColumn *column,
gtk_tree_model_get (
model, iter,
COL_STRING_DISPLAY_NAME, &name,
- COL_POINTER_CAMEL_STORE, &service,
+ COL_OBJECT_CAMEL_STORE, &service,
COL_BOOL_IS_STORE, &is_store,
COL_UINT_UNREAD, &unread, -1);
@@ -781,6 +788,7 @@ folder_tree_render_display_name (GtkTreeViewColumn *column,
}
g_free (name);
+ g_clear_object (&service);
}
static void
@@ -886,7 +894,7 @@ folder_tree_selection_changed_cb (EMFolderTree *folder_tree,
gtk_tree_model_get (
model, &iter,
- COL_POINTER_CAMEL_STORE, &store,
+ COL_OBJECT_CAMEL_STORE, &store,
COL_STRING_FULL_NAME, &folder_name,
COL_UINT_FLAGS, &flags,
COL_UINT_UNREAD, &unread,
@@ -904,6 +912,7 @@ exit:
store, folder_name, flags);
g_free (folder_name);
+ g_clear_object (&store);
g_list_foreach (list, (GFunc) gtk_tree_path_free, NULL);
g_list_free (list);
@@ -1355,7 +1364,7 @@ folder_tree_row_activated (GtkTreeView *tree_view,
gtk_tree_model_get (
model, &iter,
- COL_POINTER_CAMEL_STORE, &store,
+ COL_OBJECT_CAMEL_STORE, &store,
COL_STRING_FULL_NAME, &folder_name,
COL_UINT_FLAGS, &flags, -1);
@@ -1370,6 +1379,7 @@ folder_tree_row_activated (GtkTreeView *tree_view,
store, folder_name);
g_free (folder_name);
+ g_clear_object (&store);
}
static gboolean
@@ -1415,13 +1425,11 @@ folder_tree_row_expanded (GtkTreeView *tree_view,
gtk_tree_model_get (
model, iter,
COL_STRING_FULL_NAME, &full_name,
- COL_POINTER_CAMEL_STORE, &store,
+ COL_OBJECT_CAMEL_STORE, &store,
COL_BOOL_LOAD_SUBDIRS, &load, -1);
- if (!load) {
- g_free (full_name);
- return;
- }
+ if (!load)
+ goto exit;
gtk_tree_store_set (
GTK_TREE_STORE (model), iter,
@@ -1447,7 +1455,9 @@ folder_tree_row_expanded (GtkTreeView *tree_view,
(GAsyncReadyCallback) folder_tree_get_folder_info_cb,
context);
+exit:
g_free (full_name);
+ g_clear_object (&store);
}
static void
@@ -1919,7 +1929,7 @@ tree_drag_data_get (GtkWidget *widget,
gtk_tree_model_get (
model, &iter,
- COL_POINTER_CAMEL_STORE, &store,
+ COL_OBJECT_CAMEL_STORE, &store,
COL_STRING_FULL_NAME, &folder_name, -1);
/* make sure user isn't trying to drag on a placeholder row */
@@ -1956,6 +1966,7 @@ tree_drag_data_get (GtkWidget *widget,
fail:
gtk_tree_path_free (src_path);
+ g_clear_object (&store);
g_free (folder_name);
}
@@ -2310,7 +2321,7 @@ tree_drag_data_received (GtkWidget *widget,
gtk_tree_model_get (
model, &iter,
- COL_POINTER_CAMEL_STORE, &store,
+ COL_OBJECT_CAMEL_STORE, &store,
COL_BOOL_IS_STORE, &is_store,
COL_STRING_FULL_NAME, &full_name, -1);
@@ -2318,6 +2329,7 @@ tree_drag_data_received (GtkWidget *widget,
if (full_name == NULL && !is_store) {
gtk_drag_finish (context, FALSE, FALSE, GDK_CURRENT_TIME);
gtk_tree_path_free (dest_path);
+ g_clear_object (&store);
return;
}
@@ -2328,6 +2340,7 @@ tree_drag_data_received (GtkWidget *widget,
gdk_drag_context_get_selected_action (context) == GDK_ACTION_MOVE)) {
gtk_drag_finish (context, FALSE, FALSE, GDK_CURRENT_TIME);
gtk_tree_path_free (dest_path);
+ g_clear_object (&store);
g_free (full_name);
return;
}
@@ -2347,6 +2360,7 @@ tree_drag_data_received (GtkWidget *widget,
tree_drag_data_action (m);
gtk_tree_path_free (dest_path);
+ g_clear_object (&store);
}
static gboolean
@@ -2369,7 +2383,7 @@ folder_tree_drop_target (EMFolderTree *folder_tree,
EMFolderTreePrivate *p = folder_tree->priv;
gchar *dst_full_name = NULL;
gchar *src_full_name = NULL;
- CamelStore *dst_store;
+ CamelStore *dst_store = NULL;
CamelStore *src_store = NULL;
GdkAtom atom = GDK_NONE;
gboolean is_store;
@@ -2396,7 +2410,7 @@ folder_tree_drop_target (EMFolderTree *folder_tree,
gtk_tree_model_get (
model, &iter,
COL_BOOL_IS_STORE, &is_store,
- COL_POINTER_CAMEL_STORE, &dst_store,
+ COL_OBJECT_CAMEL_STORE, &dst_store,
COL_STRING_FULL_NAME, &dst_full_name,
COL_UINT_FLAGS, &flags, -1);
@@ -2432,7 +2446,7 @@ folder_tree_drop_target (EMFolderTree *folder_tree,
if (gtk_tree_model_get_iter (model, &iter, src_path))
gtk_tree_model_get (
model, &iter,
- COL_POINTER_CAMEL_STORE, &src_store,
+ COL_OBJECT_CAMEL_STORE, &src_store,
COL_STRING_FULL_NAME, &src_full_name,
COL_UINT_FLAGS, &src_flags, -1);
@@ -2579,10 +2593,11 @@ folder_tree_drop_target (EMFolderTree *folder_tree,
}
}
- done:
-
+done:
g_free (dst_full_name);
g_free (src_full_name);
+ g_clear_object (&dst_store);
+ g_clear_object (&src_store);
return atom;
}
@@ -2941,7 +2956,7 @@ em_folder_tree_get_selected_uris (EMFolderTree *folder_tree)
gtk_tree_model_get (
model, &iter,
- COL_POINTER_CAMEL_STORE, &store,
+ COL_OBJECT_CAMEL_STORE, &store,
COL_STRING_FULL_NAME, &folder_name, -1);
if (CAMEL_IS_STORE (store) && folder_name != NULL) {
@@ -2953,6 +2968,7 @@ em_folder_tree_get_selected_uris (EMFolderTree *folder_tree)
}
g_free (folder_name);
+ g_clear_object (&store);
}
gtk_tree_path_free (path);
}
@@ -3334,7 +3350,7 @@ em_folder_tree_get_selected (EMFolderTree *folder_tree,
gtk_tree_model_get (
model, &iter,
- COL_POINTER_CAMEL_STORE, &store,
+ COL_OBJECT_CAMEL_STORE, &store,
COL_STRING_FULL_NAME, &folder_name, -1);
/* We should always get a valid store. */
@@ -3343,12 +3359,11 @@ em_folder_tree_get_selected (EMFolderTree *folder_tree,
/* If a store is selected, the folder name will be NULL.
* Treat this as though nothing is selected, so that callers
* can assume a TRUE return value means a folder is selected. */
- if (folder_name == NULL)
+ if (folder_name == NULL) {
+ g_clear_object (&store);
return FALSE;
+ }
- /* FIXME We really should be storing the CamelStore as a GObject
- * so it gets referenced. The pointer type is a relic of
- * days before Camel used GObject. */
if (out_store != NULL)
*out_store = g_object_ref (store);
@@ -3357,6 +3372,8 @@ em_folder_tree_get_selected (EMFolderTree *folder_tree,
else
g_free (folder_name);
+ g_clear_object (&store);
+
return TRUE;
}
@@ -3382,18 +3399,22 @@ em_folder_tree_store_root_selected (EMFolderTree *folder_tree,
gtk_tree_model_get (
model, &iter,
- COL_POINTER_CAMEL_STORE, &store,
+ COL_OBJECT_CAMEL_STORE, &store,
COL_BOOL_IS_STORE, &is_store, -1);
/* We should always get a valid store. */
g_return_val_if_fail (CAMEL_IS_STORE (store), FALSE);
- if (!is_store)
+ if (!is_store) {
+ g_clear_object (&store);
return FALSE;
+ }
if (out_store != NULL)
*out_store = g_object_ref (store);
+ g_clear_object (&store);
+
return TRUE;
}
@@ -3418,15 +3439,19 @@ em_folder_tree_get_selected_uri (EMFolderTree *folder_tree)
gtk_tree_model_get (
model, &iter,
- COL_POINTER_CAMEL_STORE, &store,
+ COL_OBJECT_CAMEL_STORE, &store,
COL_STRING_FULL_NAME, &folder_name, -1);
- if (CAMEL_IS_STORE (store) && folder_name != NULL)
+ /* We should always get a valid store. */
+ g_return_val_if_fail (CAMEL_IS_STORE (store), FALSE);
+
+ if (folder_name != NULL)
folder_uri = e_mail_folder_uri_build (store, folder_name);
- else if (CAMEL_IS_STORE (store))
+ else
folder_uri = e_mail_folder_uri_build (store, "");
g_free (folder_name);
+ g_clear_object (&store);
return folder_uri;
}
@@ -3463,9 +3488,9 @@ em_folder_tree_ref_selected_store (EMFolderTree *folder_tree)
if (gtk_tree_selection_get_selected (selection, &model, &iter))
gtk_tree_model_get (
model, &iter,
- COL_POINTER_CAMEL_STORE, &store, -1);
+ COL_OBJECT_CAMEL_STORE, &store, -1);
- return (store != NULL) ? g_object_ref (store) : NULL;
+ return store;
}
void
@@ -3632,9 +3657,9 @@ em_folder_tree_restore_state (EMFolderTree *folder_tree,
gtk_tree_model_get (
tree_model, &iter,
- COL_POINTER_CAMEL_STORE, &store, -1);
+ COL_OBJECT_CAMEL_STORE, &store, -1);
- if (!CAMEL_IS_STORE (store))
+ if (store == NULL)
goto next;
service = CAMEL_SERVICE (store);
@@ -3651,6 +3676,7 @@ em_folder_tree_restore_state (EMFolderTree *folder_tree,
}
g_free (group_name);
+ g_clear_object (&store);
next:
valid = gtk_tree_model_iter_next (tree_model, &iter);
diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c
index 52e70c9..98f1b76 100644
--- a/mail/em-folder-utils.c
+++ b/mail/em-folder-utils.c
@@ -462,10 +462,11 @@ emfu_copy_folder_exclude (EMFolderTree *tree,
gtk_tree_model_get (
model, iter,
COL_UINT_FLAGS, &flags,
- COL_POINTER_CAMEL_STORE, &store, -1);
+ COL_OBJECT_CAMEL_STORE, &store, -1);
uid = camel_service_get_uid (CAMEL_SERVICE (store));
tovfolder = (g_strcmp0 (uid, E_MAIL_SESSION_VFOLDER_UID) == 0);
+ g_object_unref (store);
/* moving from vfolder to normal- not allowed */
if (fromvfolder && !tovfolder && cfd->delete)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
