[Xfce4-commits] <midori:master> Pass xbel-tiny format when loading session and trash

[Christian Dywan]

Updating branch refs/heads/master
         to 47d2176b8d7eba8d185398b3aa98da396b9194f1 (commit)
       from 53cc9986fe9abfc0a511dc22f656f6840cd8aea2 (commit)

commit 47d2176b8d7eba8d185398b3aa98da396b9194f1
Author: Christian Dywan <christian at twotoasts.de>
Date:   Wed Mar 27 19:11:41 2013 +0100

    Pass xbel-tiny format when loading session and trash

 midori/midori-frontend.c |    4 ++--
 midori/midori-session.c  |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/midori/midori-frontend.c b/midori/midori-frontend.c
index d8198c8..b135ad7 100644
--- a/midori/midori-frontend.c
+++ b/midori/midori-frontend.c
@@ -498,7 +498,7 @@ midori_normal_app_new (const gchar* config,
     {
         katze_assign (config_file, midori_paths_get_config_filename_for_reading ("session.xbel"));
         error = NULL;
-        if (!midori_array_from_file (session, config_file, "xbel", &error))
+        if (!midori_array_from_file (session, config_file, "xbel-tiny", &error))
         {
             if (error->code != G_FILE_ERROR_NOENT)
                 g_string_append_printf (error_messages,
@@ -514,7 +514,7 @@ midori_normal_app_new (const gchar* config,
         G_CALLBACK (midori_trash_remove_item_cb), NULL);
     katze_assign (config_file, g_build_filename (config, "tabtrash.xbel", NULL));
     error = NULL;
-    if (!midori_array_from_file (trash, config_file, "xbel", &error))
+    if (!midori_array_from_file (trash, config_file, "xbel-tiny", &error))
     {
         if (error->code != G_FILE_ERROR_NOENT)
             g_string_append_printf (error_messages,
diff --git a/midori/midori-session.c b/midori/midori-session.c
index 12ddfc8..f485a21 100644
--- a/midori/midori-session.c
+++ b/midori/midori-session.c
@@ -371,7 +371,7 @@ midori_browser_action_last_session_activate_cb (GtkAction*     action,
     KatzeArray* old_session = katze_array_new (KATZE_TYPE_ITEM);
     gchar* config_file = midori_paths_get_config_filename_for_reading ("session.old.xbel");
     GError* error = NULL;
-    if (midori_array_from_file (old_session, config_file, "xbel", &error))
+    if (midori_array_from_file (old_session, config_file, "xbel-tiny", &error))
     {
         KatzeItem* item;
         KATZE_ARRAY_FOREACH_ITEM (item, old_session)
@@ -379,8 +379,8 @@ midori_browser_action_last_session_activate_cb (GtkAction*     action,
     }
     else
     {
-        g_warning (_("The session couldn't be loaded: %s\n"), error->message);
-        /* FIXME: Show a graphical dialog */
+        sokoke_message_dialog (GTK_MESSAGE_ERROR,
+            _("The session couldn't be loaded: %s\n"), error->message, FALSE);
         g_error_free (error);
     }
     g_free (config_file);