custom toolbar: compose win final
authorOliver Haertel <o.h.a@gmx.net>
Sun, 22 Sep 2002 14:42:37 +0000 (14:42 +0000)
committerOliver Haertel <o.h.a@gmx.net>
Sun, 22 Sep 2002 14:42:37 +0000 (14:42 +0000)
ChangeLog.claws
configure.in
src/folderview.c
src/prefs_actions.c
src/prefs_actions.h

index c884d783b3735962229b30ff416bce41c50c91c6..0fc4d2cd0ecb76c99fa1553934f5f12f1a01d4b4 100644 (file)
@@ -1,3 +1,11 @@
+2002-09-22 [oliver]    0.8.3claws8
+
+       * src/prefs_actions.[ch]
+       custom toolbar for compose      
+               actions callback from compose toolbar
+       * src/folderview.c
+               remove include toolbar.h
+               
 2002-09-22 [oliver]    0.8.3claws7
        
        * src/prefs_toolbar.[ch]
index 8149dcb1897f1de60845a720837c3a19997ceab5..2d9ec6c8adfc12067909b3c9bc73a788aab5d11b 100644 (file)
@@ -10,7 +10,7 @@ MINOR_VERSION=8
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws7
+EXTRA_VERSION=claws8
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index a659c823e2d80a14a54d73cf99edd9384c22f64f..fd3b5af362beb2cf53f5c05108b5626b66acf27c 100644 (file)
@@ -62,7 +62,6 @@
 #include "folder.h"
 #include "inc.h"
 #include "statusbar.h"
-#include "toolbar.h"
 
 typedef enum
 {
index c23e43a604fc7e1beedb5c002b63855b6ae7b373..099d8c61bafbdcfc77676e952c8784f869d3783d 100644 (file)
@@ -998,11 +998,16 @@ void update_compose_actions_menu(GtkItemFactory *ifactory,
                            compose);
 }
 
-void actions_execute(MainWindow *mainwin
+void actions_execute(gpointer data
                     guint action_nb,
-                    GtkWidget *widget)
+                    GtkWidget *widget,
+                    gint source)
 {
-       mainwin_actions_execute_cb(mainwin, action_nb, widget);
+       if (source == TOOLBAR_MAIN) 
+               mainwin_actions_execute_cb((MainWindow*)data, action_nb, widget);
+
+       else if (source == TOOLBAR_COMPOSE)
+               compose_actions_execute_cb((Compose*)data, action_nb, widget);
 }
 
 
index e23d080ade445c6693adbd7b5d7e31eab99e0100..0246b7e294ea65e19cf0b3296826b3e56fe73e22 100644 (file)
@@ -31,8 +31,9 @@ void update_compose_actions_menu      (GtkItemFactory *ifactory,
                                         Compose        *compose);
 void prefs_actions_open                        (MainWindow     *mainwin);
 
-void actions_execute                    (MainWindow     *mainwin
+void actions_execute                    (gpointer       data
                                         guint          action_nb,
-                                        GtkWidget      *widget);
+                                        GtkWidget      *widget,
+                                        gint           source);
 
 #endif /* __ACTIONS_H__ */