* Fixes NB#61826, the outbox folder is shown as Outbox in the folder details dialog

	* Fixed some warnings

pmo-trunk-r2481

diff --git a/src/widgets/modest-details-dialog.c b/src/widgets/modest-details-dialog.c
index f6eec67..7adbf14 100644 (file)
--- a/src/widgets/modest-details-dialog.c
+++ b/src/widgets/modest-details-dialog.c
@@ -268,7 +268,7 @@ modest_details_dialog_set_folder_default (ModestDetailsDialog *self,
                                          TnyFolder *folder)
 {
        TnyFolderStats *stats;
-       gchar *count, *size_s;
+       gchar *count, *size_s, *name;
        gint size;
        
        /* Set window title */
@@ -285,12 +285,21 @@ modest_details_dialog_set_folder_default (ModestDetailsDialog *self,
        else
                size_s = modest_text_utils_get_display_size (size);
 
-       modest_details_dialog_add_data (self, _("mcen_fi_folder_properties_foldername"), 
-                                       tny_folder_get_name (folder));
+       /* Different names for the local folders */
+       if (modest_tny_folder_is_local_folder (folder)) {
+               gint type = modest_tny_folder_get_local_folder_type (folder);
+               if (type != TNY_FOLDER_TYPE_UNKNOWN)
+                       name = g_strdup(modest_local_folder_info_get_type_display_name (type));
+       } else {
+               name = g_strdup (tny_folder_get_name (folder));
+       }
+
+       modest_details_dialog_add_data (self, _("mcen_fi_folder_properties_foldername"), name);
        modest_details_dialog_add_data (self, _("mcen_fi_folder_properties_messages"), count);
        modest_details_dialog_add_data (self, _("mcen_fi_folder_properties_size"), size_s);
 
        /* Frees */
+       g_free (name);
        g_free (size_s);
        g_free (count);
        g_object_unref (stats);

diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c
index 3820c0a..ca3e0ed 100644 (file)
--- a/src/widgets/modest-folder-view.c
+++ b/src/widgets/modest-folder-view.c
@@ -126,9 +126,9 @@ static gint         expand_row_timeout     (gpointer data);
 
 static void         setup_drag_and_drop    (GtkTreeView *self);
 
-static void          _clipboard_set_selected_data (ModestFolderView *folder_view, gboolean delete);
+static gboolean     _clipboard_set_selected_data (ModestFolderView *folder_view, gboolean delete);
 
-static void          _clear_hidding_filter (ModestFolderView *folder_view);
+static void         _clear_hidding_filter (ModestFolderView *folder_view);
 
 
 
@@ -2002,11 +2002,11 @@ _clipboard_set_selected_data (ModestFolderView *folder_view,
        TnyFolderStore *folder = NULL;
        gboolean retval = FALSE;
 
-       g_return_if_fail (MODEST_IS_FOLDER_VIEW (folder_view));
+       g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (folder_view), FALSE);
        priv = MODEST_FOLDER_VIEW_GET_PRIVATE (folder_view);
                
        /* Set selected data on clipboard   */
-       g_return_if_fail (MODEST_IS_EMAIL_CLIPBOARD (priv->clipboard));
+       g_return_val_if_fail (MODEST_IS_EMAIL_CLIPBOARD (priv->clipboard), FALSE);
        folder = modest_folder_view_get_selected (folder_view);
 
        /* Do not allow to select an account */