X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-maemo-utils.c;h=0c0639588d2884f6b41c03f7fe163471353be32e;hb=abebc6be47a91ec7498bcba014525e7d346e33d1;hp=196d68683898bdcb9c75412ebb96de27056cc1d1;hpb=7929406e046ed92142ff337bd9161e6a16e1d04e;p=modest

diff --git a/src/maemo/modest-maemo-utils.c b/src/maemo/modest-maemo-utils.c
index 196d686..0c06395 100644
--- a/src/maemo/modest-maemo-utils.c
+++ b/src/maemo/modest-maemo-utils.c
@@ -49,6 +49,7 @@
 
 #include <modest-defs.h>
 #include "modest-maemo-utils.h"
+#include "modest-text-utils.h"
 #include "modest-platform.h"
 
 /*
@@ -209,21 +210,12 @@ modest_maemo_utils_setup_images_filechooser (GtkFileChooser *chooser)
 
 	/* Set the images mime filter */
 	file_filter = gtk_file_filter_new ();
-#ifdef MODEST_HAVE_HILDON0_WIDGETS
-	image_mimetypes_list = osso_mime_get_mime_types_for_category (OSSO_MIME_CATEGORY_IMAGES);
-#else
 	image_mimetypes_list = hildon_mime_get_mime_types_for_category (HILDON_MIME_CATEGORY_IMAGES);
-#endif
 	for (node = image_mimetypes_list; node != NULL; node = g_list_next (node)) {
 		gtk_file_filter_add_mime_type (file_filter, node->data);
 	}
 	gtk_file_chooser_set_filter (chooser, file_filter);
-#ifdef MODEST_HAVE_HILDON0_WIDGETS
-	osso_mime_types_list_free (image_mimetypes_list);
-#else
 	hildon_mime_types_list_free (image_mimetypes_list);
-#endif
-
 }
 
 void
@@ -236,31 +228,26 @@ modest_maemo_set_thumbable_scrollbar (GtkScrolledWindow *win,
 #endif /* MODEST_HAVE_HILDON1_WIDGETS */
 }
 
-FILE*
-modest_maemo_open_mcc_mapping_file (void)
+GtkWidget *
+modest_maemo_utils_get_manager_menubar_as_menu (GtkUIManager *manager,
+						const gchar *item_name)
 {
-	FILE* result;
-	
-	const gchar* path;
-	const gchar* path1 = MODEST_OPERATOR_WIZARD_MCC_MAPPING;
-	const gchar* path2 = MODEST_MCC_MAPPING;
-	
-	if (access(path1, R_OK) == 0) 
-		path = path1;
-	else if (access(path2, R_OK) == 0)
-		path = path2;
-	else {
-		g_warning ("%s: neither '%s' nor '%s' is a readable mapping file",
-			   __FUNCTION__, path1, path2);
-		return NULL;
+	GtkWidget *new_menu;
+	GtkWidget *menubar;
+	GList *children, *iter;
+
+	menubar = gtk_ui_manager_get_widget (manager, item_name);
+	new_menu = gtk_menu_new ();
+
+	children = gtk_container_get_children (GTK_CONTAINER (menubar));
+	for (iter = children; iter != NULL; iter = g_list_next (iter)) {
+		GtkWidget *menu;
+
+		menu = GTK_WIDGET (iter->data);
+		gtk_widget_reparent (menu, new_menu);
 	}
 	
-	result = fopen (path, "r");
-	if (!result) {
-		g_warning ("%s: error opening mapping file '%s': %s",
-			   __FUNCTION__, path, strerror(errno));
-		return NULL;
-	}
-	return result;
-}
+	g_list_free (children);
 
+	return new_menu;
+}