gimp r26916 - in trunk: . app/gui

[tml svn gnome org]

Author: tml
Date: Wed Sep 10 19:25:54 2008
New Revision: 26916
URL: http://svn.gnome.org/viewvc/gimp?rev=26916&view=rev

Log:
2008-09-10  Tor Lillqvist  <tml novell com>

	* app/gui/gui-unique.c: gui_unique_win32_message_handler() can be
	static. Include file/file-open.h for file_open_from_command_line()
	declaration. Fix copy/paste glitch in gui_unique_exit().



Modified:
   trunk/ChangeLog
   trunk/app/gui/gui-unique.c

Modified: trunk/app/gui/gui-unique.c
==============================================================================
--- trunk/app/gui/gui-unique.c	(original)
+++ trunk/app/gui/gui-unique.c	Wed Sep 10 19:25:54 2008
@@ -49,6 +49,8 @@
 #endif
 
 #ifdef G_OS_WIN32
+#include "file/file-open.h"
+
 static void gui_unique_win32_init  (Gimp *gimp);
 static void gui_unique_win32_exit  (void);
 
@@ -69,10 +71,10 @@
 void
 gui_unique_exit (void)
 {
-#if HAVE_DBUS_GLIB
-  gui_dbus_service_exit ();
-#elif HAVE_DBUS_GLIB
+#ifdef G_OS_WIN32
   gui_unique_win32_exit ();
+#elif HAVE_DBUS_GLIB
+  gui_dbus_service_exit ();
 #endif
 }
 
@@ -172,7 +174,7 @@
 }
 
 
-LRESULT CALLBACK
+static LRESULT CALLBACK
 gui_unique_win32_message_handler (HWND   hWnd,
 				  UINT   uMsg,
 				  WPARAM wParam,