dasher r3632 - in trunk: . Src Src/Gtk2

[pwelche svn gnome org]

Author: pwelche
Date: Mon Mar  2 11:30:24 2009
New Revision: 3632
URL: http://svn.gnome.org/viewvc/dasher?rev=3632&view=rev

Log:
Missed some gnome-vfs references in r3605 - from Tom Parker, #572134


Modified:
   trunk/ChangeLog
   trunk/Src/Gtk2/dasher_editor_internal.cpp
   trunk/Src/main.cc

Modified: trunk/Src/Gtk2/dasher_editor_internal.cpp
==============================================================================
--- trunk/Src/Gtk2/dasher_editor_internal.cpp	(original)
+++ trunk/Src/Gtk2/dasher_editor_internal.cpp	Mon Mar  2 11:30:24 2009
@@ -1402,7 +1402,6 @@
 dasher_editor_internal_gvfs_print_error(DasherEditor *pSelf, GError *error, const char *myfilename) {
   // Turns a GVFS error into English
   GtkWidget *error_dialog;
-  // error_dialog = gtk_message_dialog_new(GTK_WINDOW(window), GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "Could not open the file \"%s\"\n%s\n", myfilename, gnome_vfs_result_to_string(*result));
   error_dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "Could not open the file \"%s\"\n%s\n", myfilename, error->message);
   gtk_dialog_set_default_response(GTK_DIALOG(error_dialog), GTK_RESPONSE_OK);
   gtk_window_set_resizable(GTK_WINDOW(error_dialog), FALSE);

Modified: trunk/Src/main.cc
==============================================================================
--- trunk/Src/main.cc	(original)
+++ trunk/Src/main.cc	Mon Mar  2 11:30:24 2009
@@ -31,7 +31,6 @@
 #ifdef GNOME_LIBS
 #include <libgnome/libgnome.h>
 #include <libgnomeui/libgnomeui.h>
-#include <libgnomevfs/gnome-vfs.h>
 #endif
 
 // #include <libintl.h>
@@ -237,9 +236,7 @@
      argc, argv,
      GNOME_PARAM_NONE);
 #endif
-
-  gnome_vfs_init();
-#endif
+#endif /* GNOME_LIBS */
 
 #if (defined GNOME_SPEECH || defined GNOME_A11Y)
   if(!bonobo_is_initialized()) {
@@ -284,10 +281,6 @@
   /* TODO: check that this really does the right thing with the references counting */
   if(g_pDasherMain)
     g_object_unref(G_OBJECT(g_pDasherMain));
-
-#ifdef GNOME_LIBS
-  gnome_vfs_shutdown();
-#endif
 }
 
 void sigint_handler(int iSigNum) {