2007-11-07 [paul] 3.0.2cvs122

	* src/toolbar.c
		MAEMO: remove tooltips

diff --git a/ChangeLog b/ChangeLog
index 45fc74659a2cd0b0e21c1aaf830f746bdd17e38a..b32f66cedbba93ba3a7f674ee0b6d69b504ac886 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-07 [paul]      3.0.2cvs122
+
+       * src/toolbar.c
+               MAEMO: remove tooltips
+

 2007-11-07 [colin]     3.0.2cvs121
 
        * src/plugins/pgpinline/pgpinline.c
 2007-11-07 [colin]     3.0.2cvs121
 
        * src/plugins/pgpinline/pgpinline.c

diff --git a/PATCHSETS b/PATCHSETS
index ecaf33545adf7f67640be52b3a52586cad5cbc12..f1c5abfc5d996fea84ea42edf51956d86b516392 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3034,3 +3034,4 @@
 ( cvs diff -u -r 1.25.2.23 -r 1.25.2.24 tools/Makefile.am;  cvs diff -u -r 1.30.2.25 -r 1.30.2.26 tools/README;  diff -u /dev/null tools/csv2addressbook.pl;  ) > 3.0.2cvs119.patchset
 ( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/prefs_summary_open.c;  ) > 3.0.2cvs120.patchset
 ( cvs diff -u -r 1.1.2.36 -r 1.1.2.37 src/plugins/pgpinline/pgpinline.c;  ) > 3.0.2cvs121.patchset
 ( cvs diff -u -r 1.25.2.23 -r 1.25.2.24 tools/Makefile.am;  cvs diff -u -r 1.30.2.25 -r 1.30.2.26 tools/README;  diff -u /dev/null tools/csv2addressbook.pl;  ) > 3.0.2cvs119.patchset
 ( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/prefs_summary_open.c;  ) > 3.0.2cvs120.patchset
 ( cvs diff -u -r 1.1.2.36 -r 1.1.2.37 src/plugins/pgpinline/pgpinline.c;  ) > 3.0.2cvs121.patchset

+( cvs diff -u -r 1.43.2.90 -r 1.43.2.91 src/toolbar.c;  ) > 3.0.2cvs122.patchset

diff --git a/configure.ac b/configure.ac
index e9c3bc19deb1b42f36800c950c88a5427037e8ce..cb71f0970fff449982316f5e505228c857170cfa 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=121
+EXTRA_VERSION=122

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/toolbar.c b/src/toolbar.c
index ed9e3c7333a7134cca85695c569c0d59f2c1d997..90c573b1c607ea1a76d921159602130aa3a591d3 100644 (file)
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -875,15 +875,19 @@ static void activate_compose_button (Toolbar           *toolbar,
                gtk_tool_button_set_icon_widget(
                        GTK_TOOL_BUTTON(toolbar->compose_mail_btn),
                        toolbar->compose_news_icon);
                gtk_tool_button_set_icon_widget(
                        GTK_TOOL_BUTTON(toolbar->compose_mail_btn),
                        toolbar->compose_news_icon);

+#ifndef MAEMO

                gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(toolbar->compose_mail_btn), GTK_TOOLTIPS(toolbar->tooltips),
                gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(toolbar->compose_mail_btn), GTK_TOOLTIPS(toolbar->tooltips),

-                       _("Compose News message"), NULL);       
+                       _("Compose News message"), NULL);
+#endif 

                gtk_widget_show(toolbar->compose_news_icon);
        } else {
                gtk_tool_button_set_icon_widget(
                        GTK_TOOL_BUTTON(toolbar->compose_mail_btn),
                        toolbar->compose_mail_icon);
                gtk_widget_show(toolbar->compose_news_icon);
        } else {
                gtk_tool_button_set_icon_widget(
                        GTK_TOOL_BUTTON(toolbar->compose_mail_btn),
                        toolbar->compose_mail_icon);

+#ifndef MAEMO

                gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(toolbar->compose_mail_btn), GTK_TOOLTIPS(toolbar->tooltips),
                gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(toolbar->compose_mail_btn), GTK_TOOLTIPS(toolbar->tooltips),

-                       _("Compose Email"), NULL);      
+                       _("Compose Email"), NULL);
+#endif 

                gtk_widget_show(toolbar->compose_mail_icon);
        }
        toolbar->compose_btn_type = type;
                gtk_widget_show(toolbar->compose_mail_icon);
        }
        toolbar->compose_btn_type = type;


@@ -912,8 +916,10 @@ static void activate_learn_button (Toolbar           *toolbar,
                gtk_tool_button_set_label(
                        GTK_TOOL_BUTTON(toolbar->learn_spam_btn),
                        _("Spam"));
                gtk_tool_button_set_label(
                        GTK_TOOL_BUTTON(toolbar->learn_spam_btn),
                        _("Spam"));

+#ifndef MAEMO

                gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(toolbar->learn_spam_btn), GTK_TOOLTIPS(toolbar->tooltips),
                        _("Learn spam"), NULL); 
                gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(toolbar->learn_spam_btn), GTK_TOOLTIPS(toolbar->tooltips),
                        _("Learn spam"), NULL); 

+#endif

                gtk_widget_show(toolbar->learn_spam_icon);
        } else {
                gtk_tool_button_set_icon_widget(
                gtk_widget_show(toolbar->learn_spam_icon);
        } else {
                gtk_tool_button_set_icon_widget(


@@ -922,8 +928,10 @@ static void activate_learn_button (Toolbar           *toolbar,
                gtk_tool_button_set_label(
                        GTK_TOOL_BUTTON(toolbar->learn_spam_btn),
                        _("Ham"));
                gtk_tool_button_set_label(
                        GTK_TOOL_BUTTON(toolbar->learn_spam_btn),
                        _("Ham"));

+#ifndef MAEMO

                gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(toolbar->learn_spam_btn), GTK_TOOLTIPS(toolbar->tooltips),
                gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(toolbar->learn_spam_btn), GTK_TOOLTIPS(toolbar->tooltips),

-                       _("Learn ham"), NULL);  
+                       _("Learn ham"), NULL);
+#endif 

                gtk_widget_show(toolbar->learn_ham_icon);
        }
        toolbar->learn_btn_type = type; 
                gtk_widget_show(toolbar->learn_ham_icon);
        }
        toolbar->learn_btn_type = type; 


@@ -1707,7 +1715,7 @@ static void toolbar_buttons_cb(GtkWidget   *widget,
                }
        }
 }
                }
        }
 }

-
+#ifndef MAEMO

 #define TOOLBAR_ITEM(item,icon,text,tooltip) {                                                         \
        item = GTK_WIDGET(gtk_tool_button_new(icon, text));                                             \
        gtk_tool_item_set_homogeneous(GTK_TOOL_ITEM(item), FALSE);                                      \
 #define TOOLBAR_ITEM(item,icon,text,tooltip) {                                                         \
        item = GTK_WIDGET(gtk_tool_button_new(icon, text));                                             \
        gtk_tool_item_set_homogeneous(GTK_TOOL_ITEM(item), FALSE);                                      \


@@ -1740,6 +1748,34 @@ static void toolbar_buttons_cb(GtkWidget   *widget,
        gtk_widget_set_size_request(GTK_WIDGET(gchild->data), 9, -1);                                   \
        g_list_free(gchild);                                                                            \
 }
        gtk_widget_set_size_request(GTK_WIDGET(gchild->data), 9, -1);                                   \
        g_list_free(gchild);                                                                            \
 }

+#else
+#define TOOLBAR_ITEM(item,icon,text,tooltip) {                                                         \
+       item = GTK_WIDGET(gtk_tool_button_new(icon, text));                                             \
+       gtk_tool_item_set_homogeneous(GTK_TOOL_ITEM(item), FALSE);                                      \
+       gtk_tool_item_set_is_important(GTK_TOOL_ITEM(item), TRUE);                                      \
+       g_signal_connect (G_OBJECT(item), "clicked", G_CALLBACK(toolbar_buttons_cb), toolbar_item);     \
+       gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(item), -1);                              \
+}
+
+#define TOOLBAR_MENUITEM(item,icon,text,tooltip,menutip) {                                             \
+       GtkWidget *child = NULL, *btn = NULL, *arr = NULL;                                              \
+       GList *gchild = NULL;                                                                           \
+       item = GTK_WIDGET(gtk_menu_tool_button_new(icon, text));                                        \
+       gtk_tool_item_set_homogeneous(GTK_TOOL_ITEM(item), FALSE);                              \
+       gtk_tool_item_set_is_important(GTK_TOOL_ITEM(item), TRUE);                                      \
+       g_signal_connect (G_OBJECT(item), "clicked", G_CALLBACK(toolbar_buttons_cb), toolbar_item);     \
+       gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(item), -1);                              \
+       child = gtk_bin_get_child(GTK_BIN(item));                                                       \
+       gchild = gtk_container_get_children(                                                            \
+                       GTK_CONTAINER(child));                                                          \
+       btn = (GtkWidget *)gchild->data;                                                                \
+       arr = (GtkWidget *)(gchild->next?gchild->next->data:NULL);                                      \
+       g_list_free(gchild);                                                                            \
+       gchild = gtk_container_get_children(GTK_CONTAINER(arr));                                        \
+       gtk_widget_set_size_request(GTK_WIDGET(gchild->data), 9, -1);                                   \
+       g_list_free(gchild);                                                                            \
+}
+#endif

 
 #define MAKE_MENU(entries,path,btn) {                                                                  \
        n_menu_entries = sizeof(entries) /                                                              \
 
 #define MAKE_MENU(entries,path,btn) {                                                                  \
        n_menu_entries = sizeof(entries) /                                                              \


@@ -1767,15 +1803,15 @@ Toolbar *toolbar_create(ToolbarType      type,
        GtkWidget *menu;
        guint n_menu_entries;
        GtkItemFactory *factory;
        GtkWidget *menu;
        guint n_menu_entries;
        GtkItemFactory *factory;

-       GtkTooltips *toolbar_tips;

        ToolbarSylpheedActions *action_item;
        GSList *cur;
        GSList *toolbar_list;
        Toolbar *toolbar_data;
        ToolbarSylpheedActions *action_item;
        GSList *cur;
        GSList *toolbar_list;
        Toolbar *toolbar_data;

-
+#ifndef MAEMO
+       GtkTooltips *toolbar_tips;

        
        toolbar_tips = gtk_tooltips_new();
        
        toolbar_tips = gtk_tooltips_new();

-       
+#endif 

        toolbar_read_config_file(type);
        toolbar_list = toolbar_get_list(type);
 
        toolbar_read_config_file(type);
        toolbar_list = toolbar_get_list(type);
 


@@ -2033,7 +2069,9 @@ Toolbar *toolbar_create(ToolbarType        type,
 
        }
        toolbar_data->toolbar = toolbar;
 
        }
        toolbar_data->toolbar = toolbar;

+#ifndef MAEMO

        toolbar_data->tooltips = toolbar_tips;
        toolbar_data->tooltips = toolbar_tips;

+#endif

        gtk_widget_show_all(toolbar);
 
        if (type == TOOLBAR_MAIN) {
        gtk_widget_show_all(toolbar);
 
        if (type == TOOLBAR_MAIN) {