From: Dirk-Jan C. Binnema <dirk-jan.binnema@nokia.com>
Date: Tue, 9 Jan 2007 16:00:26 +0000 (+0000)
Subject: * Makefile.am:
X-Git-Tag: git_migration_finished~4285
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;ds=sidebyside;h=c587301790cfe4bd0199101e36eab36625717c1e;p=modest

* Makefile.am:
  - put pixmaps in right dir
* modest-main-window.c:
  - remaemoize a bit + compile fixes

pmo-trunk-r594
---

diff --git a/src/maemo/Makefile.am b/src/maemo/Makefile.am
index a349db8..d3ec39e 100644
--- a/src/maemo/Makefile.am
+++ b/src/maemo/Makefile.am
@@ -1,6 +1,6 @@
 #
 # Makefile.am
-# Time-stamp: <2006-11-29 17:51:15 (djcb)>
+# Time-stamp: <2007-01-09 17:08:25 (djcb)>
 #
 #
 # use Automake 'trick' ==> convenience static libraries, which
@@ -9,7 +9,9 @@
 INCLUDES=\
 	$(MODEST_GSTUFF_CFLAGS) \
 	$(MODEST_LIBTINYMAIL_GNOME_DESKTOP_CFLAGS) \
+	-DMODEST_PLATFORM_ID=$(MODEST_PLATFORM_ID) \
 	-I ${top_srcdir}/src  \
+	-DPIXMAP_PREFIX=\"${datadir}/pixmaps/modest/\" \
 	-DPREFIX=\"@prefix@\" \
 	-Wall
 
@@ -41,5 +43,5 @@ LDADD = \
 
 EXTRA_DIST=pixmaps/*
 
-pixmapdir = $(prefix)/share/modest/pixmaps
+pixmapdir = $(prefix)/share/pixmaps/modest/
 pixmap_DATA = $(PIXMAP_FILES)
diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c
index 02c2bba..2eb54d0 100644
--- a/src/maemo/modest-main-window.c
+++ b/src/maemo/modest-main-window.c
@@ -66,7 +66,6 @@ struct _ModestMainWindowPrivate {
 	GtkUIManager *ui_manager;
 
 	GtkWidget *toolbar;
-	GtkWidget *menubar;
 	GtkWidget *msg_paned;
 	GtkWidget *main_paned;
 	
@@ -279,8 +278,6 @@ modest_main_window_new (ModestWidgetFactory *widget_factory,
 
 	/* Toolbar / Menubar */
 	priv->toolbar = gtk_ui_manager_get_widget (priv->ui_manager, "/ToolBar");
-	priv->menubar = gtk_ui_manager_get_widget (priv->ui_manager, "/MenuBar");
-
 	gtk_toolbar_set_tooltips (GTK_TOOLBAR (priv->toolbar), TRUE);
 
 	/* widgets from factory */
@@ -318,15 +315,15 @@ modest_main_window_new (ModestWidgetFactory *widget_factory,
 
 	/* putting it all together... */
 	main_vbox = gtk_vbox_new (FALSE, 6);
-	gtk_box_pack_start (GTK_BOX(main_vbox), priv->menubar, FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX(main_vbox), priv->toolbar, FALSE, FALSE, 0);
 	gtk_box_pack_start (GTK_BOX(main_vbox), priv->main_paned, TRUE, TRUE,0);
+	gtk_box_pack_start (GTK_BOX(main_vbox), priv->toolbar, FALSE, FALSE, 0);
 	gtk_box_pack_start (GTK_BOX(main_vbox), status_hbox, FALSE, FALSE, 0);
+
 	
 	gtk_container_add (GTK_CONTAINER(obj), main_vbox);
 	restore_sizes (MODEST_MAIN_WINDOW(obj));	
 
-	gtk_window_set_title (GTK_WINDOW(obj), "Modest");
+	gtk_window_set_title (GTK_WINDOW(obj), _("Modest"));
 	gtk_window_set_icon  (GTK_WINDOW(obj),
 			      modest_icon_factory_get_icon (MODEST_APP_ICON));