commit ea5b2b143c3a12d9deca84b209882878c5212a51
parent 92431478ab5ceef89b397bf4e969c21ed491aae0
Author: Colin Leroy <colin@colino.net>
Date: Thu, 31 Jul 2008 06:38:54 +0000
2008-07-31 [colin] 3.5.0cvs40
* src/addressbook.c
* src/compose.c
* src/mainwindow.c
* src/messageview.c
Some Maemo fixes
* src/gtk/menu.c
* src/gtk/menu.h
Remove deprecated helper funcs
Diffstat:
9 files changed, 44 insertions(+), 97 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,14 @@
+2008-07-31 [colin] 3.5.0cvs40
+
+ * src/addressbook.c
+ * src/compose.c
+ * src/mainwindow.c
+ * src/messageview.c
+ Some Maemo fixes
+ * src/gtk/menu.c
+ * src/gtk/menu.h
+ Remove deprecated helper funcs
+
2008-07-30 [colin] 3.5.0cvs39
* src/folderview.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3451,3 +3451,4 @@
( cvs diff -u -r 1.101.2.52 -r 1.101.2.53 src/news.c; ) > 3.5.0cvs37.patchset
( cvs diff -u -r 1.61.2.80 -r 1.61.2.81 src/account.c; cvs diff -u -r 1.11.2.10 -r 1.11.2.11 src/account.h; cvs diff -u -r 1.12.2.51 -r 1.12.2.52 src/action.c; cvs diff -u -r 1.3.2.9 -r 1.3.2.10 src/action.h; cvs diff -u -r 1.5.2.9 -r 1.5.2.10 src/addressitem.h; cvs diff -u -r 1.382.2.459 -r 1.382.2.460 src/compose.c; cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/edittags.c; cvs diff -u -r 1.274.2.257 -r 1.274.2.258 src/mainwindow.c; cvs diff -u -r 1.39.2.49 -r 1.39.2.50 src/mainwindow.h; cvs diff -u -r 1.83.2.137 -r 1.83.2.138 src/mimeview.c; cvs diff -u -r 1.395.2.377 -r 1.395.2.378 src/summaryview.c; cvs diff -u -r 1.5.2.32 -r 1.5.2.33 src/gtk/menu.c; cvs diff -u -r 1.4.2.17 -r 1.4.2.18 src/gtk/menu.h; ) > 3.5.0cvs38.patchset
( cvs diff -u -r 1.207.2.203 -r 1.207.2.204 src/folderview.c; cvs diff -u -r 1.20.2.22 -r 1.20.2.23 src/folderview.h; cvs diff -u -r 1.1.2.59 -r 1.1.2.60 src/imap_gtk.c; cvs diff -u -r 1.2.2.32 -r 1.2.2.33 src/mh_gtk.c; cvs diff -u -r 1.2.2.27 -r 1.2.2.28 src/news_gtk.c; ) > 3.5.0cvs39.patchset
+( cvs diff -u -r 1.60.2.121 -r 1.60.2.122 src/addressbook.c; cvs diff -u -r 1.382.2.460 -r 1.382.2.461 src/compose.c; cvs diff -u -r 1.274.2.258 -r 1.274.2.259 src/mainwindow.c; cvs diff -u -r 1.94.2.182 -r 1.94.2.183 src/messageview.c; cvs diff -u -r 1.5.2.33 -r 1.5.2.34 src/gtk/menu.c; cvs diff -u -r 1.4.2.18 -r 1.4.2.19 src/gtk/menu.h; ) > 3.5.0cvs40.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=39
+EXTRA_VERSION=40
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/addressbook.c b/src/addressbook.c
@@ -948,7 +948,11 @@ static void addressbook_create(void)
gtk_action_group_add_actions(action_group, addressbook_list_popup_entries,
G_N_ELEMENTS(addressbook_list_popup_entries), NULL);
+#ifndef MAEMO
MENUITEM_ADDUI_MANAGER(ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_MENUBAR)
+#else
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_MENU)
+#endif
MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu", "Book", "Book", GTK_UI_MANAGER_MENU)
MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu", "Address", "Address", GTK_UI_MANAGER_MENU)
@@ -1003,7 +1007,11 @@ static void addressbook_create(void)
menubar = gtk_ui_manager_get_widget(ui_manager, "/Menu");
+#ifndef MAEMO
gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
+#else
+ hildon_window_set_menu(HILDON_WINDOW(window), GTK_MENU(menubar));
+#endif
vbox2 = gtk_vbox_new(FALSE, BORDER_WIDTH);
gtk_container_set_border_width(GTK_CONTAINER(vbox2), BORDER_WIDTH);
diff --git a/src/compose.c b/src/compose.c
@@ -6687,7 +6687,11 @@ static Compose *compose_create(PrefsAccount *account,
gtk_action_group_add_radio_actions(action_group, compose_radio_enc_entries,
G_N_ELEMENTS(compose_radio_enc_entries), C_AUTO, G_CALLBACK(compose_set_encoding_cb), (gpointer)compose);
+#ifndef MAEMO
MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_MENUBAR)
+#else
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_MENU)
+#endif
MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu", "Message", "Message", GTK_UI_MANAGER_MENU)
MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu", "Edit", "Edit", GTK_UI_MANAGER_MENU)
@@ -6864,7 +6868,11 @@ static Compose *compose_create(PrefsAccount *account,
gtk_widget_show_all(menubar);
gtk_window_add_accel_group(GTK_WINDOW(window), gtk_ui_manager_get_accel_group(compose->ui_manager));
+#ifndef MAEMO
gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
+#else
+ hildon_window_set_menu(HILDON_WINDOW(window), GTK_MENU(menubar));
+#endif
if (prefs_common.toolbar_detachable) {
handlebox = gtk_handle_box_new();
diff --git a/src/gtk/menu.c b/src/gtk/menu.c
@@ -24,14 +24,6 @@
#include <glib.h>
#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenubar.h>
-#include <gtk/gtkcheckmenuitem.h>
-#include <gtk/gtkitemfactory.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkutils.h>
#include "menu.h"
#include "utils.h"
@@ -49,41 +41,6 @@
static void connect_accel_change_signals(GtkWidget* widget, GtkWidget *wid2) ;
-GtkWidget *menubar_create(GtkWidget *window, GtkItemFactoryEntry *entries,
- guint n_entries, const gchar *path, gpointer data)
-{
- GtkItemFactory *factory;
- GtkWidget *menubar;
-
-#ifdef MAEMO
- factory = gtk_item_factory_new(GTK_TYPE_MENU, path, NULL);
-#else
- factory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, path, NULL);
-#endif
- gtk_item_factory_set_translate_func(factory, menu_translate,
- NULL, NULL);
- gtk_item_factory_create_items(factory, n_entries, entries, data);
- gtk_window_add_accel_group (GTK_WINDOW (window), factory->accel_group);
-
- menubar = gtk_item_factory_get_widget(factory, path);
-#ifdef MAEMO
- hildon_window_set_menu(HILDON_WINDOW(window), GTK_MENU(menubar));
-#endif
- return menubar;
-}
-
-GtkWidget *menu_create_items(GtkItemFactoryEntry *entries,
- guint n_entries, const gchar *path,
- GtkItemFactory **factory, gpointer data)
-{
- *factory = gtk_item_factory_new(GTK_TYPE_MENU, path, NULL);
- gtk_item_factory_set_translate_func(*factory, menu_translate,
- NULL, NULL);
- gtk_item_factory_create_items(*factory, n_entries, entries, data);
-
- return gtk_item_factory_get_widget(*factory, path);
-}
-
GtkActionGroup *cm_menu_create_action_group(const gchar *name, GtkActionEntry *entries,
gint num_entries, gpointer data)
{
@@ -113,19 +70,6 @@ gchar *menu_translate(const gchar *path, gpointer data)
return retval;
}
-void menu_set_sensitive(GtkItemFactory *ifactory, const gchar *path,
- gboolean sensitive)
-{
- GtkWidget *widget;
-
- g_return_if_fail(ifactory != NULL);
-
- widget = gtk_item_factory_get_item(ifactory, path);
- g_return_if_fail(widget != NULL);
-
- gtk_widget_set_sensitive(widget, sensitive);
-}
-
void cm_menu_set_sensitive(gchar *menu, gboolean sensitive)
{
GtkUIManager *gui_manager = gtkut_ui_manager();
@@ -188,23 +132,6 @@ void menu_set_sensitive_all(GtkMenuShell *menu_shell, gboolean sensitive)
gtk_widget_set_sensitive(GTK_WIDGET(cur->data), sensitive);
}
-void menu_set_active(GtkItemFactory *ifactory, const gchar *path,
- gboolean is_active)
-{
- GtkWidget *widget;
-
- g_return_if_fail(ifactory != NULL);
-
- widget = gtk_item_factory_get_item(ifactory, path);
- g_return_if_fail(widget != NULL);
-
- if (!GTK_IS_CHECK_MENU_ITEM(widget)) {
- debug_print("%s not check_menu_item\n", path?path:"(null)");
- return;
- }
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widget), is_active);
-}
-
void menu_button_position(GtkMenu *menu, gint *x, gint *y, gboolean *push_in,
gpointer user_data)
{
diff --git a/src/gtk/menu.h b/src/gtk/menu.h
@@ -21,11 +21,7 @@
#define __MENU_H__
#include <glib.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkitemfactory.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenushell.h>
-#include <gtk/gtkoptionmenu.h>
+#include <gtk/gtk.h>
#define MENU_VAL_ID "Claws::Menu::ValueID"
#define MENU_VAL_DATA "Claws::Menu::ValueDATA"
@@ -83,22 +79,8 @@
#define menu_set_insensitive_all(menu_shell) \
menu_set_sensitive_all(menu_shell, FALSE);
-GtkWidget *menubar_create (GtkWidget *window,
- GtkItemFactoryEntry *entries,
- guint n_entries,
- const gchar *path,
- gpointer data);
-GtkWidget *menu_create_items (GtkItemFactoryEntry *entries,
- guint n_entries,
- const gchar *path,
- GtkItemFactory **factory,
- gpointer data);
gchar *menu_translate (const gchar *path, gpointer data);
-void menu_set_sensitive (GtkItemFactory *ifactory,
- const gchar *path,
- gboolean sensitive);
-
GtkActionGroup *cm_menu_create_action_group(const gchar *name, GtkActionEntry *entries,
gint num_entries, gpointer data);
GtkActionGroup *cm_menu_create_action_group_full(GtkUIManager *ui_manager,
@@ -109,9 +91,6 @@ void cm_toggle_menu_set_active(gchar *menu, gboolean active);
void cm_menu_set_sensitive_full(GtkUIManager *gui_manager, gchar *menu, gboolean sensitive);
void cm_toggle_menu_set_active_full(GtkUIManager *gui_manager, gchar *menu, gboolean active);
-void menu_set_active (GtkItemFactory *ifactory,
- const gchar *path,
- gboolean is_active);
void menu_button_position (GtkMenu *menu,
gint *x,
gint *y,
diff --git a/src/mainwindow.c b/src/mainwindow.c
@@ -1533,8 +1533,11 @@ MainWindow *main_window_create()
gtk_action_group_add_radio_actions(mainwin->action_group, mainwin_radio_dec_entries,
G_N_ELEMENTS(mainwin_radio_dec_entries), C_AUTO, G_CALLBACK(set_decode_cb), (gpointer)mainwin);
+#ifndef MAEMO
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_MENUBAR)
-
+#else
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_MENU)
+#endif
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu", "File", "File", GTK_UI_MANAGER_MENU)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu", "Edit", "Edit", GTK_UI_MANAGER_MENU)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu", "View", "View", GTK_UI_MANAGER_MENU)
@@ -1881,6 +1884,8 @@ MainWindow *main_window_create()
#ifndef MAEMO
gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
+#else
+ hildon_window_set_menu(HILDON_WINDOW(window), GTK_MENU(menubar));
#endif
diff --git a/src/messageview.c b/src/messageview.c
@@ -444,7 +444,11 @@ static void messageview_add_toolbar(MessageView *msgview, GtkWidget *window)
gtk_action_group_add_radio_actions(action_group, msgview_radio_dec_entries,
G_N_ELEMENTS(msgview_radio_dec_entries), C_AUTO, G_CALLBACK(set_decode_cb), (gpointer)msgview);
+#ifndef MAEMO
MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_MENUBAR)
+#else
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_MENU)
+#endif
MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu", "File", "File", GTK_UI_MANAGER_MENU)
MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu", "Edit", "Edit", GTK_UI_MANAGER_MENU)
@@ -610,7 +614,11 @@ static void messageview_add_toolbar(MessageView *msgview, GtkWidget *window)
gtk_widget_show_all(menubar);
gtk_window_add_accel_group(GTK_WINDOW(window), gtk_ui_manager_get_accel_group(msgview->ui_manager));
+#ifndef MAEMO
gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
+#else
+ hildon_window_set_menu(HILDON_WINDOW(window), GTK_MENU(menubar));
+#endif
if (prefs_common.toolbar_detachable) {
handlebox = gtk_handle_box_new();
