2007-10-11 [colin] 3.0.2cvs58
authorColin Leroy <colin@colino.net>
Thu, 11 Oct 2007 07:03:10 +0000 (07:03 +0000)
committerColin Leroy <colin@colino.net>
Thu, 11 Oct 2007 07:03:10 +0000 (07:03 +0000)
* src/messageview.c
Make shift-shortcuts work
* src/prefs_actions.c
Don't ask if we really want to close when
choosing OK and only the list is changed
* src/prefs_template.c
Don't ask if we really want to close when
choosing OK and only the list is changed
* src/common/plugin.c
Fix writing of second [Plugins_*] block
* src/common/template.c
Remove unused files (fixes deletion)

ChangeLog
PATCHSETS
configure.ac
src/common/plugin.c
src/common/template.c
src/messageview.c
src/prefs_actions.c
src/prefs_template.c

index 84ef4d1..f789c83 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2007-10-11 [colin]     3.0.2cvs58
+
+       * src/messageview.c
+               Make shift-shortcuts work
+       * src/prefs_actions.c
+               Don't ask if we really want to close when
+               choosing OK and only the list is changed
+       * src/prefs_template.c
+               Don't ask if we really want to close when
+               choosing OK and only the list is changed
+       * src/common/plugin.c
+               Fix writing of second [Plugins_*] block
+       * src/common/template.c
+               Remove unused files (fixes deletion)
+
 2007-10-10 [paul]      3.0.2cvs57
 
        * src/prefs_template.c
index 4770395..11832b7 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.14.2.36 -r 1.14.2.37 src/editaddress.c;  ) > 3.0.2cvs55.patchset
 ( cvs diff -u -r 1.382.2.415 -r 1.382.2.416 src/compose.c;  ) > 3.0.2cvs56.patchset
 ( cvs diff -u -r 1.12.2.49 -r 1.12.2.50 src/prefs_template.c;  ) > 3.0.2cvs57.patchset
+( cvs diff -u -r 1.94.2.158 -r 1.94.2.159 src/messageview.c;  cvs diff -u -r 1.60.2.52 -r 1.60.2.53 src/prefs_actions.c;  cvs diff -u -r 1.12.2.50 -r 1.12.2.51 src/prefs_template.c;  cvs diff -u -r 1.13.2.32 -r 1.13.2.33 src/common/plugin.c;  cvs diff -u -r 1.2.4.21 -r 1.2.4.22 src/common/template.c;  ) > 3.0.2cvs58.patchset
index ae1904d..3a368ca 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=57
+EXTRA_VERSION=58
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 72cf087..f105481 100644 (file)
@@ -145,7 +145,7 @@ void plugin_save_list(void)
 
                g_free(rcpath); 
                
-               return;
+               continue;
 
 revert:
                g_warning("failed to write plugin list\n");
index ccf65d1..8412e05 100644 (file)
@@ -267,6 +267,21 @@ void template_write_config(GSList *tmpl_list)
                g_free(new);
                g_free(filename);
        }
+       
+       /* remove other templates */
+       while (TRUE) {
+               gchar *filename = g_strconcat(path, G_DIR_SEPARATOR_S,
+                                      itos(tmpl_num), NULL);
+               if (is_file_exist(filename)) {
+                       debug_print("removing old template %d\n", tmpl_num);
+                       g_unlink(filename);
+                       g_free(filename);
+               } else {
+                       g_free(filename);
+                       break;
+               }
+               tmpl_num++;
+       }
 }
 
 GSList *template_get_config(void)
index 19f8db7..142c37b 100644 (file)
@@ -1377,7 +1377,7 @@ static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
                return TRUE;
        }
 
-       if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) != 0)
+       if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK|GDK_SHIFT_MASK)) != 0)
                return FALSE;
 
        g_signal_stop_emission_by_name(G_OBJECT(widget),
index a6eb2ee..1fcea47 100644 (file)
@@ -786,12 +786,7 @@ static void prefs_actions_ok(GtkWidget *widget, gpointer data)
                                 GTK_STOCK_CLOSE, _("+_Continue editing"),
                                 NULL) != G_ALERTDEFAULT) {
                return;
-       } else if (modified_list && alertpanel(_("Actions list not saved"),
-                                _("The actions list has been modified. Close anyway?"),
-                                GTK_STOCK_CLOSE, _("+_Continue editing"), 
-                                NULL) != G_ALERTDEFAULT) {
-               return;
-       }
+       } 
        modified = FALSE;
        modified_list = FALSE;
        prefs_actions_set_list();
index bc258cb..0b2b1c9 100644 (file)
@@ -493,12 +493,7 @@ static void prefs_template_ok_cb(void)
                                 GTK_STOCK_CLOSE, _("+_Continue editing"), 
                                 NULL) != G_ALERTDEFAULT) {
                return;
-       } else if (modified_list && alertpanel(_("Templates list not saved"),
-                                _("The templates list has been modified. Close anyway?"),
-                                GTK_STOCK_CLOSE, _("+_Continue editing"), 
-                                NULL) != G_ALERTDEFAULT) {
-               return;
-       }
+       } 
        modified = FALSE;
        modified_list = FALSE;
        tmpl_list = prefs_template_get_list();