[Rawstudio-commit] r3289 - trunk/src

[Anders Brander]

Author: abrander
Date: 2010-04-01 16:02:49 +0200 (Thu, 01 Apr 2010)
New Revision: 3289

Modified:
   trunk/src/gtk-interface.c
   trunk/src/gtk-interface.h
Log:
Use gui_status_push/pop() properly.

Modified: trunk/src/gtk-interface.c
===================================================================
--- trunk/src/gtk-interface.c   2010-04-01 13:56:26 UTC (rev 3288)
+++ trunk/src/gtk-interface.c   2010-04-01 14:02:49 UTC (rev 3289)
@@ -973,14 +973,14 @@
        rs_conf_set_string(CONF_LWD, g_get_home_dir());
 
        rs_store_remove(rs->store, NULL, NULL);
-       gui_status_push(_("Opening directory..."));
+       guint msgid = gui_status_push(_("Opening directory..."));
        gui_set_busy(TRUE);
        GTK_CATCHUP();
        if (rs_store_load_directory(rs->store, path) >= 0)
                        rs_conf_set_string(CONF_LWD, path);
        rs_window_set_title(path);
        GTK_CATCHUP();
-       gui_status_push(_("Ready"));
+       gui_status_pop(msgid);
        gui_set_busy(FALSE);
 
        /* Restore directory */
@@ -1169,7 +1169,7 @@
        g_object_set (gtk_settings_get_default (), "gtk-menu-images", TRUE, 
NULL);
        g_object_set (gtk_settings_get_default (), "gtk-button-images", TRUE, 
NULL);
 
-       gui_status_push(_("Ready"));
+       if(gui_status_push(_("Ready"))); /* To put  a "buttom" the status 
stack, we ignore the reutrn value */
 
        // arrange rawstudio as the user left it
        gboolean show_iconbox;

Modified: trunk/src/gtk-interface.h
===================================================================
--- trunk/src/gtk-interface.h   2010-04-01 13:56:26 UTC (rev 3288)
+++ trunk/src/gtk-interface.h   2010-04-01 14:02:49 UTC (rev 3289)
@@ -29,7 +29,7 @@
 extern void gui_set_busy(gboolean rawstudio_is_busy);
 extern gboolean gui_is_busy();
 extern void gui_status_notify(const char *text);
-extern guint gui_status_push(const char *text);
+extern guint gui_status_push(const char *text) G_GNUC_WARN_UNUSED_RESULT;
 extern void gui_status_pop(const guint msgid);
 extern void icon_set_flags(const gchar *filename, GtkTreeIter *iter, const 
guint *priority, const gboolean *exported);
 extern void gui_dialog_simple(gchar *title, gchar *message);


_______________________________________________
Rawstudio-commit mailing list
Rawstudio-commit@rawstudio.org
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit