2008-07-07 [colin] 3.5.0cvs19

[claws.git] / src / prefs_themes.c

diff --git a/src/prefs_themes.c b/src/prefs_themes.c
index da9e7d8d6e1011c9f307b568abcf8e104545bd58..cb99e27585a1d7d0dd0b907ac4b4afa9ca62df35 100644 (file)
--- a/src/prefs_themes.c
+++ b/src/prefs_themes.c
@@ -168,8 +168,10 @@ static void prefs_themes_file_stats(const gchar *filename, gpointer data)
                di->files++;
                len = strlen(filename);
                if (len > 4) {
-                       if (filename[len - 1] == 'm' && filename[len - 2] == 'p' &&
-                           filename[len - 3] == 'x' && filename[len - 4] == '.')
+                       const gchar *extension = filename+(len-4);
+                       if (!strcmp(extension, ".xpm"))
+                               di->pixms++;
+                       else if (!strcmp(extension, ".png"))
                                di->pixms++;
                }
        }
@@ -189,7 +191,7 @@ static void prefs_themes_file_remove(const gchar *filename, gpointer data)
                        g_warning("prefs_themes_file_remove(): subdir in theme dir skipped: '%s'.\n",
                                                base);
        }
-       else if (0 != g_unlink(filename)) {
+       else if (0 != claws_unlink(filename)) {
                (*status) = g_strdup(filename);
        }
        g_free(base);
@@ -542,11 +544,22 @@ static void prefs_themes_btn_install_clicked_cb(GtkWidget *widget, gpointer data
                                          themename, NULL);
        }
        if (TRUE == is_dir_exist(cinfo->dest)) {
-               alertpanel_error(_("A theme with the same name is\nalready installed in this location"));
-               goto end_inst;
+               AlertValue val = alertpanel_full(_("Theme exists"),
+                               _("A theme with the same name is\nalready installed in this location.\n\n"
+                                 "Do you want to replace it?"),
+                               GTK_STOCK_CANCEL, _("Overwrite"), NULL, FALSE,
+                               NULL, ALERT_WARNING, G_ALERTDEFAULT);
+               if (val == G_ALERTALTERNATE) {
+                       if (remove_dir_recursive(cinfo->dest) < 0) {
+                               alertpanel_error(_("Couldn't delete the old theme in %s."), cinfo->dest);
+                               goto end_inst;
+                       }
+               } else {
+                       goto end_inst;
+               }
        }
        if (0 != make_dir_hier(cinfo->dest)) {
-               alertpanel_error(_("Couldn't create destination directory"));
+               alertpanel_error(_("Couldn't create destination directory %s."), cinfo->dest);
                goto end_inst;
        }
        prefs_themes_foreach_file(source, prefs_themes_file_install, cinfo);
@@ -559,7 +572,7 @@ static void prefs_themes_btn_install_clicked_cb(GtkWidget *widget, gpointer data
                                            (gpointer)(cinfo->dest), 
                                            (GCompareFunc)strcmp2);
                if (NULL != insted) {
-                       alertpanel_notice(_("Theme installed successfully"));
+                       alertpanel_notice(_("Theme installed successfully."));
                        tdata->displayed = (gchar *)(insted->data);
                        prefs_themes_set_themes_menu(GTK_COMBO_BOX(tdata->page->op_menu), tdata);
                        prefs_themes_display_global_stats(tdata);
@@ -761,7 +774,7 @@ static gchar *prefs_themes_get_theme_stats(const gchar *dirname)
        
        prefs_themes_foreach_file(dirname, prefs_themes_file_stats, dinfo);
        stats = g_strdup_printf(_("%d files (%d icons), size: %s"), 
-                               dinfo->files, dinfo->pixms, to_human_readable(dinfo->bytes));
+                               dinfo->files, dinfo->pixms, to_human_readable((goffset)dinfo->bytes));
        
        g_free(dinfo);
        return stats;