2007-07-27 [paul] 2.10.0cvs74

[claws.git] / src / toolbar.h

diff --git a/src/toolbar.h b/src/toolbar.h
index 8eda03cc2134d30816fe38274e65d8c5026e060b..7b16f306ba022b331c766c2bc6bdb910db18d9a0 100644 (file)
--- a/src/toolbar.h
+++ b/src/toolbar.h
@@ -4,7 +4,7 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #ifndef __CUSTOM_TOOLBAR_H__
@@ -49,26 +49,21 @@ typedef enum
 struct _Toolbar {
        GtkWidget *toolbar;
 
+       GtkWidget *folders_btn;
        GtkWidget *get_btn;
        GtkWidget *getall_btn;
-       ComboButton *getall_combo;
        GtkWidget *send_btn;
 
        GtkWidget *compose_mail_btn;
-       GtkWidget *compose_news_btn;
-       ComboButton *compose_combo;
+       GtkWidget *compose_mail_icon;
+       GtkWidget *compose_news_icon;
 
        GtkWidget *reply_btn;
-       ComboButton *reply_combo;
        GtkWidget *replysender_btn;
-       ComboButton *replysender_combo;
        GtkWidget *replyall_btn;
-       ComboButton *replyall_combo;
        GtkWidget *replylist_btn;
-       ComboButton *replylist_combo;
 
        GtkWidget *fwd_btn;
-       ComboButton *fwd_combo;
        
        GtkWidget *trash_btn;
        GtkWidget *delete_btn;
@@ -78,8 +73,8 @@ struct _Toolbar {
 
        GtkWidget *separator;
        GtkWidget *learn_spam_btn;
-       GtkWidget *learn_ham_btn;
-       ComboButton *ham_combo;
+       GtkWidget *learn_spam_icon;
+       GtkWidget *learn_ham_icon;
        
        GtkWidget *cancel_inc_btn;
        
@@ -106,6 +101,7 @@ struct _Toolbar {
        GSList    *action_list;
        GSList    *item_list;
 
+       GtkTooltips *tooltips;
 };
 
 struct _ToolbarItem {
@@ -170,8 +166,10 @@ enum {
        A_GOTO_PREV,
        A_GOTO_NEXT,
        A_IGNORE_THREAD,
+       A_WATCH_THREAD,
        A_PRINT,
        A_LEARN_SPAM,
+       A_GO_FOLDERS,
 
        /* compose toolbar */
        A_SEND,