parent_class = g_type_class_peek_parent (klass);
gobject_class->finalize = modest_folder_view_finalize;
- gobject_class->finalize = modest_folder_view_dispose;
+ gobject_class->dispose = modest_folder_view_dispose;
g_type_class_add_private (gobject_class,
sizeof(ModestFolderViewPrivate));
buffer = g_string_append (buffer, *item_name);
if (concat_folder_name) {
- buffer = g_string_append (buffer, folder_name);
+ if (!is_special && folder_type == TNY_FOLDER_TYPE_DRAFTS) {
+ buffer = g_string_append (buffer, folder_name);
+ /* TODO: append a sensitive string to the remote drafts to
+ * be able to know it's the remote one */
+/* buffer = g_string_append (buffer, " (TODO:remote)"); */
+ } else {
+ buffer = g_string_append (buffer, folder_name);
+ }
}
g_free (*item_name);
g_object_unref (account);
/* Convert INBOX */
if (type == TNY_FOLDER_TYPE_INBOX &&
- !g_ascii_strcasecmp (fname, "Inbox")) {
+ g_str_has_suffix (fname, "Inbox")) {
g_free (item_name);
item_name = g_strdup (_("mcen_me_folder_inbox"));
}
{
ThreePixbufs *retval;
- if (!*pixbuf) {
+ if (pixbuf && !*pixbuf) {
GdkPixbuf *icon;
icon = modest_platform_get_icon (icon_code, FOLDER_ICON_SIZE);
if (icon) {
}
}
- if (!*pixbuf_open && pixbuf && *pixbuf)
+ if (pixbuf_open && !*pixbuf_open && pixbuf && *pixbuf)
*pixbuf_open = get_composite_pixbuf ("qgn_list_gene_fldr_exp",
FOLDER_ICON_SIZE,
*pixbuf);
- if (!*pixbuf_close && pixbuf && *pixbuf)
+ if (pixbuf_close && !*pixbuf_close && pixbuf && *pixbuf)
*pixbuf_close = get_composite_pixbuf ("qgn_list_gene_fldr_clp",
FOLDER_ICON_SIZE,
*pixbuf);
retval = g_slice_new0 (ThreePixbufs);
- if (*pixbuf)
+ if (pixbuf && *pixbuf)
retval->pixbuf = g_object_ref (*pixbuf);
- if (*pixbuf_open)
+ else
+ retval->pixbuf = NULL;
+ if (pixbuf_open && *pixbuf_open)
retval->pixbuf_open = g_object_ref (*pixbuf_open);
- if (*pixbuf_close)
+ else
+ retval->pixbuf_open = NULL;
+ if (pixbuf_close && *pixbuf_close)
retval->pixbuf_close = g_object_ref (*pixbuf_close);
+ else
+ retval->pixbuf_close = NULL;
return retval;
}
static void
modest_folder_view_dispose (GObject *obj)
{
- static gboolean disposed = FALSE;
ModestFolderViewPrivate *priv;
- if (disposed)
- return;
-
priv = MODEST_FOLDER_VIEW_GET_PRIVATE (obj);
#ifdef MODEST_TOOLKIT_HILDON2
- modest_signal_mgr_disconnect_all_and_destroy (priv->signal_handlers);
+ if (priv->signal_handlers) {
+ modest_signal_mgr_disconnect_all_and_destroy (priv->signal_handlers);
+ priv->signal_handlers = NULL;
+ }
#endif
/* Free external references */
g_object_unref (priv->list_to_move);
priv->list_to_move = NULL;
}
+
+ G_OBJECT_CLASS(parent_class)->dispose (obj);
}
static void
self,
NULL);
- if (priv->signal_handlers > 0) {
- GtkTreeModel *old_tny_model;
-
- if (get_inner_models (self, NULL, NULL, &old_tny_model)) {
+ GtkTreeModel *old_tny_model = NULL;
+ if (get_inner_models (self, NULL, NULL, &old_tny_model)) {
+ if (priv->signal_handlers > 0) {
priv->signal_handlers = modest_signal_mgr_disconnect (priv->signal_handlers,
G_OBJECT (old_tny_model),
"activity-changed");
priv->signal_handlers = modest_signal_mgr_connect (priv->signal_handlers,
G_OBJECT (model),
"activity-changed",
- G_CALLBACK (on_activity_changed),
+ G_CALLBACK (on_activity_changed),
self);
#endif