# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1315243037 0
# Node ID 36608dc2a3ad293f89a67a595a2df811cf4224e6
# Parent  d82c76a842f8b02f4b41245aaee1045558022842
Fix win32 build for gtkdocklet changes.

I'm not happy with the way this works right now:
 * The menu is scrolled off the bottom of the screen with the default taskbar
 placement
 * Closing the buddy list quits

diff -r d82c76a842f8 -r 36608dc2a3ad pidgin/Makefile.mingw
--- a/pidgin/Makefile.mingw	Sun Sep 04 21:11:24 2011 +0000
+++ b/pidgin/Makefile.mingw	Mon Sep 05 17:17:17 2011 +0000
@@ -95,8 +95,6 @@
 			minidialog.c \
 			pidginstock.c \
 			pidgintooltip.c \
-			win32/MinimizeToTray.c \
-			win32/gtkdocklet-win32.c \
 			win32/gtkwin32dep.c \
 			win32/untar.c \
 			win32/wspell.c
diff -r d82c76a842f8 -r 36608dc2a3ad pidgin/gtkdocklet.c
--- a/pidgin/gtkdocklet.c	Sun Sep 04 21:11:24 2011 +0000
+++ b/pidgin/gtkdocklet.c	Mon Sep 05 17:17:17 2011 +0000
@@ -1036,6 +1036,7 @@
 	void *accounts_handle = purple_accounts_get_handle();
 	void *status_handle = purple_savedstatuses_get_handle();
 	void *docklet_handle = pidgin_docklet_get_handle();
+	gchar *tmp;
 
 	purple_prefs_add_none(PIDGIN_PREFS_ROOT "/docklet");
 	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/docklet/blink", FALSE);
@@ -1051,8 +1052,9 @@
 		purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/docklet/gtk/embedded", FALSE);
 	}
 
-	gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(),
-		DATADIR G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S "pidgin" G_DIR_SEPARATOR_S "tray");
+	tmp = g_build_path(G_DIR_SEPARATOR_S, DATADIR, "pixmaps", "pidgin", "tray", NULL);
+	gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), tmp);
+	g_free(tmp);
 
 	if (!strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/docklet/show"), "always"))
 		docklet_gtk_status_create(FALSE);