From 9950975d6bb33a75e1e22bab496b49ddcad03f1d Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 10 Sep 2008 19:25:54 +0000 Subject: [PATCH] gui_unique_win32_message_handler() can be static. Include file/file-open.h 2008-09-10 Tor Lillqvist * 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(). svn path=/trunk/; revision=26916 --- ChangeLog | 6 ++++++ app/gui/gui-unique.c | 10 ++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8e6b79bb26..11f21b70be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-09-10 Tor Lillqvist + + * 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(). + 2008-09-10 Michael Natterer * app/widgets/gimpactionview.c: factor out function that selects a diff --git a/app/gui/gui-unique.c b/app/gui/gui-unique.c index 02c838f817..1eeab270f9 100644 --- a/app/gui/gui-unique.c +++ b/app/gui/gui-unique.c @@ -49,6 +49,8 @@ static DBusGConnection *dbus_connection = NULL; #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 @@ gui_unique_init (Gimp *gimp) 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 @@ gui_unique_win32_idle_open (IdleOpenData *data) } -LRESULT CALLBACK +static LRESULT CALLBACK gui_unique_win32_message_handler (HWND hWnd, UINT uMsg, WPARAM wParam,