fix last commit

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 646a4549c5b4cf06642338652534cc6170f2cc26..019a8ff226204150f64d42dbc2d61e987f7aa85e 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,7 +1,7 @@
 2004-06-04 [christoph] 0.9.11cvs3
 
        * src/account.c
-       * src/action.c
+       * src/action.[ch]
        * src/addressbook.c
        * src/addrindex.h
        * src/folder.h

diff --git a/src/action.c b/src/action.c
index 915052fa714673ec84c10c0e7d119cbce8d8eae5..e68a563bcb376870595a6b11a66f521f403f7c5f 100644 (file)
--- a/src/action.c
+++ b/src/action.c
@@ -98,7 +98,7 @@ struct _ChildInfo
 };
 
 static void action_update_menu         (GtkItemFactory *ifactory,
-                                        const gchar    *branch_path,
+                                        gchar          *branch_path,
                                         gpointer        callback,
                                         gpointer        data);
 static void compose_actions_execute_cb (Compose        *compose,
@@ -405,7 +405,7 @@ void actions_execute(gpointer data,
 }
 
 void action_update_mainwin_menu(GtkItemFactory *ifactory,
-                               const gchar *branch_path,
+                               gchar *branch_path,
                                MainWindow *mainwin)
 {
        action_update_menu(ifactory, branch_path,
@@ -413,7 +413,7 @@ void action_update_mainwin_menu(GtkItemFactory *ifactory,
 }
 
 void action_update_msgview_menu(GtkItemFactory *ifactory,
-                               const gchar *branch_path,
+                               gchar *branch_path,
                                MessageView *msgview)
 {
        action_update_menu(ifactory, branch_path,
@@ -421,7 +421,7 @@ void action_update_msgview_menu(GtkItemFactory *ifactory,
 }
 
 void action_update_compose_menu(GtkItemFactory *ifactory, 
-                               const gchar *branch_path,
+                               gchar *branch_path,
                                Compose *compose)
 {
        action_update_menu(ifactory, branch_path,
@@ -429,7 +429,7 @@ void action_update_compose_menu(GtkItemFactory *ifactory,
 }
 
 static void action_update_menu(GtkItemFactory *ifactory, 
-                              const gchar *branch_path,
+                              gchar *branch_path,
                               gpointer callback, gpointer data)
 {
        GtkWidget *menuitem;
@@ -439,7 +439,7 @@ static void action_update_menu(GtkItemFactory *ifactory,
        GList *amenu;
        GtkItemFactoryEntry ifentry = {NULL, NULL, NULL, 0, "<Branch>"};
 
-       ifentry.path = g_strdup(branch_path);
+       ifentry.path = branch_path;
        menuitem = gtk_item_factory_get_widget(ifactory, branch_path);
        g_return_if_fail(menuitem != NULL);
 
@@ -471,8 +471,6 @@ static void action_update_menu(GtkItemFactory *ifactory,
                g_free(action);
                ifentry.callback_action++;
        }
-
-       g_free(ifentry.path);
 }
 
 static void compose_actions_execute_cb(Compose *compose, guint action_nb,

diff --git a/src/action.h b/src/action.h
index d3d7a028c8e7c59df9fe1029f30e4b90d5032bd1..ce2031124c4f12e12747546e07a9b2f9314b6469 100644 (file)
--- a/src/action.h
+++ b/src/action.h
@@ -53,13 +53,13 @@ void actions_execute                (gpointer       data,
                                 gint           source);
 
 void action_update_mainwin_menu        (GtkItemFactory *ifactory,
-                                const gchar    *branch_path,
+                                gchar          *branch_path,
                                 MainWindow     *mainwin);
 void action_update_msgview_menu        (GtkItemFactory *ifactory,
-                                const gchar    *branch_path,
+                                gchar          *branch_path,
                                 MessageView    *msgview);
 void action_update_compose_menu        (GtkItemFactory *ifactory,
-                                const gchar    *branch_path,
+                                gchar          *branch_path,
                                 Compose        *compose);
 
 #endif /* __ACTION_H__ */