glom r1989 - in trunk: . glom glom/libglom

[arminb svn gnome org]

Author: arminb
Date: Mon Mar 16 13:51:44 2009
New Revision: 1989
URL: http://svn.gnome.org/viewvc/glom?rev=1989&view=rev

Log:
2009-03-16  Armin Burgmeier  <armin openismus com>

	* glom/libglom/gst-package.c: Converted a C++ comment to a C comment,
	to avoid a warning.

	* glom/main.cc (main): Fixed the build on Linux, which was broken
	since my last commit.


Modified:
   trunk/ChangeLog
   trunk/glom/libglom/gst-package.c
   trunk/glom/main.cc

Modified: trunk/glom/libglom/gst-package.c
==============================================================================
--- trunk/glom/libglom/gst-package.c	(original)
+++ trunk/glom/libglom/gst-package.c	Mon Mar 16 13:51:44 2009
@@ -21,7 +21,7 @@
  *            Carlos Garnacho <carlosg gnome org>
  */
 
-//TODO: Use PackageKit? Is that recommended on all major distros now?
+/* TODO: Use PackageKit? Is that recommended on all major distros now? */
 /* Commented-out because this is only useful when 
  * using the example code while patching
  * ConnectionPoolBackends::PostgresSelf::install_postgres().

Modified: trunk/glom/main.cc
==============================================================================
--- trunk/glom/main.cc	(original)
+++ trunk/glom/main.cc	Mon Mar 16 13:51:44 2009
@@ -119,11 +119,11 @@
     std::cerr << "Failed to initialize WinSock: " << errcode << std::endl;
     return -1;
   }
-#endif
 
   gchar* installation_dir_c = g_win32_get_package_installation_directory_of_module(NULL);
   const std::string installation_dir(installation_dir_c);
   g_free(installation_dir_c);
+#endif
 
   // TODO: I am not sure why, but this does not work. PYTHONPATH is set
   // correctly according to getenv(), but python still does not look in it.