+2005-10-27 [martin] 1.9.15cvs119
+
+ * src/action.c
+ ignore actions with a leading '/' in the action menu name
+ fixes a crash on menu creation
+ * src/prefs_actions.c
+ do not allow a leading '/' in the action menu name
+
2005-10-27 [paul] 1.9.15cvs118
* src/main.c
( cvs diff -u -r 1.13.2.10 -r 1.13.2.11 src/plugins/clamav/clamav_plugin.c; cvs diff -u -r 1.12.2.6 -r 1.12.2.7 src/plugins/dillo_viewer/dillo_viewer.c; cvs diff -u -r 1.9.2.5 -r 1.9.2.6 src/plugins/mathml_viewer/mathml_viewer.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/pgpcore/plugin.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpinline/plugin.c; cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/plugins/pgpmime/plugin.c; cvs diff -u -r 1.18.2.10 -r 1.18.2.11 src/plugins/spamassassin/spamassassin.c; cvs diff -u -r 1.14.2.25 -r 1.14.2.26 src/plugins/trayicon/trayicon.c; ) > 1.9.15cvs116.patchset
( cvs diff -u -r 1.49.2.66 -r 1.49.2.67 src/procmime.c; ) > 1.9.15cvs117.patchset
( cvs diff -u -r 1.115.2.63 -r 1.115.2.64 src/main.c; ) > 1.9.15cvs118.patchset
+( cvs diff -u -r 1.12.2.26 -r 1.12.2.27 src/action.c; cvs diff -u -r 1.60.2.25 -r 1.60.2.26 src/prefs_actions.c; ) > 1.9.15cvs119.patchset
MICRO_VERSION=15
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=118
+EXTRA_VERSION=119
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
action = g_strdup((gchar *)cur->data);
action_p = strstr(action, ": ");
if (action_p && action_p[2] &&
- action_get_type(&action_p[2]) != ACTION_ERROR) {
+ (action_get_type(&action_p[2]) != ACTION_ERROR) &&
+ (action[0] != '/')) {
action_p[0] = '\0';
menu_path = g_strdup_printf("%s/%s", branch_path,
action);
return -1;
}
+ if (entry_text[0] == '/') {
+ alertpanel_error(_("A leading '/' is not allowed in the menu name."));
+ return -1;
+ }
+
if (strchr(entry_text, ':')) {
alertpanel_error(_("Colon ':' is not allowed in the menu name."));
return -1;
}
strncpy(action, entry_text, PREFSBUFSIZE - 1);
-
+
while (strstr(action, "//")) {
char *to_move = strstr(action, "//")+1;
char *where = strstr(action, "//");