dasher r3489 - in trunk: . Src/Gtk2

[alarson svn gnome org]

Author: alarson
Date: Sun Mar 30 20:09:43 2008
New Revision: 3489
URL: http://svn.gnome.org/viewvc/dasher?rev=3489&view=rev

Log:
Apply Gentoo dasher-4.6.1-gnome.patch permit compilation without
gnome.  

The patch uncommented several "#ifdef GNOME_LIBS" lines that were
noted as being potentially defective in r2987.  Since there are a
number of other references to GNOME_LIBS in other parts of the source,
I have to assume the issue has been resolved.  If not, the situation
now is no worse than it was before this patch, and the #ifdefs are now
more consistent.



Modified:
   trunk/ChangeLog
   trunk/Src/Gtk2/dasher_editor.cpp
   trunk/Src/Gtk2/dasher_editor_internal.cpp

Modified: trunk/Src/Gtk2/dasher_editor.cpp
==============================================================================
--- trunk/Src/Gtk2/dasher_editor.cpp	(original)
+++ trunk/Src/Gtk2/dasher_editor.cpp	Sun Mar 30 20:09:43 2008
@@ -22,10 +22,9 @@
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-/* TODO: r4epair gnome libs flags (or get rid of entirely) */
-//#ifdef GNOME_LIBS 
+#ifdef GNOME_LIBS 
 #include <libgnomevfs/gnome-vfs.h> 
-//#endif
+#endif
 
 #include "dasher_action_keyboard.h"
 #ifdef WITH_MAEMO

Modified: trunk/Src/Gtk2/dasher_editor_internal.cpp
==============================================================================
--- trunk/Src/Gtk2/dasher_editor_internal.cpp	(original)
+++ trunk/Src/Gtk2/dasher_editor_internal.cpp	Sun Mar 30 20:09:43 2008
@@ -4,10 +4,9 @@
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-/* TODO: r4epair gnome libs flags (or get rid of entirely) */
-//#ifdef GNOME_LIBS 
+#ifdef GNOME_LIBS 
 #include <libgnomevfs/gnome-vfs.h> 
-//#endif
+#endif
 
 
 #ifdef WITH_MAEMO