* src/maemo/modest-connection-specific-smtp-edit-window.c:

[modest] / src / maemo / modest-maemo-utils.c

diff --git a/src/maemo/modest-maemo-utils.c b/src/maemo/modest-maemo-utils.c
index 4baa10e..b943d61 100644 (file)
--- a/src/maemo/modest-maemo-utils.c
+++ b/src/maemo/modest-maemo-utils.c
@@ -75,7 +75,7 @@ modest_maemo_utils_menubar_to_menu (GtkUIManager *ui_manager)
 {
        GtkWidget *main_menu;
        GtkWidget *menubar;
-       GList *iter;
+       GList *children, *iter;
 
        g_return_val_if_fail (ui_manager, NULL);
        
@@ -85,7 +85,7 @@ modest_maemo_utils_menubar_to_menu (GtkUIManager *ui_manager)
        /* Get the menubar from the UI manager */
        menubar = gtk_ui_manager_get_widget (ui_manager, "/MenuBar");
 
-       iter = gtk_container_get_children (GTK_CONTAINER (menubar));
+       iter = children = gtk_container_get_children (GTK_CONTAINER (menubar));
        while (iter) {
                GtkWidget *menu;
 
@@ -94,6 +94,7 @@ modest_maemo_utils_menubar_to_menu (GtkUIManager *ui_manager)
 
                iter = g_list_next (iter);
        }
+       g_list_free (children);
        return main_menu;
 }
 
@@ -564,16 +565,6 @@ modest_maemo_utils_setup_images_filechooser (GtkFileChooser *chooser)
 
 }
 
-void
-modest_maemo_show_information_note_and_forget (GtkWindow *parent_window, const gchar* message)
-{
-       GtkDialog *dialog = GTK_DIALOG (hildon_note_new_information (parent_window, message));
-       
-       /* Destroy the dialog when it is closed: */
-       g_signal_connect (G_OBJECT (dialog), "response", G_CALLBACK (gtk_widget_destroy), NULL);
-       gtk_widget_show (GTK_WIDGET (dialog));
-}
-
 #if 0
 static void
 on_hide (GtkDialog *dialog, gpointer user_data)
@@ -665,3 +656,26 @@ modest_maemo_toggle_action_set_active_block_notify (GtkToggleAction *action, gbo
        }
 
 }
+
+
+
+FILE*
+modest_maemo_open_mcc_mapping_file (void)
+{
+       FILE* result;
+       
+       /* Load the file one line at a time: */
+#ifdef MODEST_HILDON_VERSION_0
+       const gchar* filepath = PROVIDER_DATA_DIR "/mcc_mapping";
+#else
+       const gchar* filepath = "/usr/share/operator-wizard/mcc_mapping";
+#endif /*MODEST_HILDON_VERSION_0*/
+       
+       result = fopen (filepath, "r"); 
+       if (!result) 
+               g_printerr ("modest: failed to open mcc mapping file");
+       
+       return result;
+}
+
+