pidgin: 4a5d49d9: Fix win32 build for gtkdocklet changes.

[datallah at pidgin.im]

----------------------------------------------------------------------
Revision: 4a5d49d94ae44a21c23f7977dd7b6b9f69dfb000
Parent:   6f21535004485d16ec64ef6a7c331cf5df7346e6
Author:   datallah at pidgin.im
Date:     09/05/11 13:17:17
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/4a5d49d94ae44a21c23f7977dd7b6b9f69dfb000

Changelog: 

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

Changes against parent 6f21535004485d16ec64ef6a7c331cf5df7346e6

  patched  pidgin/Makefile.mingw
  patched  pidgin/gtkdocklet.c

-------------- next part --------------
============================================================
--- pidgin/Makefile.mingw	867b6c76a7ab966075f38718bb81a9ce5308a473
+++ pidgin/Makefile.mingw	e0bce7f6b5c39a30ab7ddcb0562f10a7e45c4469
@@ -95,8 +95,6 @@ PIDGIN_C_SRC =	\
 			minidialog.c \
 			pidginstock.c \
 			pidgintooltip.c \
-			win32/MinimizeToTray.c \
-			win32/gtkdocklet-win32.c \
 			win32/gtkwin32dep.c \
 			win32/untar.c \
 			win32/wspell.c
============================================================
--- pidgin/gtkdocklet.c	011bca4285d51004c58eae2030c3de862cb40adb
+++ pidgin/gtkdocklet.c	e101de232236d2fbdff1bf4d525dfe47da827fc5
@@ -1036,6 +1036,7 @@ pidgin_docklet_init()
 	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 @@ pidgin_docklet_init()
 		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);