pidgin: 3f45fb46: Build the "Pidgin Theme Editor" plugin o...

[datallah at pidgin.im]

----------------------------------------------------------------------
Revision: 3f45fb467a368f69da5333f03c401698d89d14bc
Parent:   d4d69fea75073152418e32247324703f325b532f
Author:   datallah at pidgin.im
Date:     11/04/10 14:23:41
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3f45fb467a368f69da5333f03c401698d89d14bc

Changelog: 

Build the "Pidgin Theme Editor" plugin on Windows too.

Changes against parent d4d69fea75073152418e32247324703f325b532f

  patched  pidgin/plugins/Makefile.mingw
  patched  pidgin/plugins/themeedit-icon.c
  patched  pidgin/plugins/themeedit.c
  patched  pidgin/win32/nsis/pidgin-installer.nsi

-------------- next part --------------
============================================================
--- pidgin/win32/nsis/pidgin-installer.nsi	9bcfaf30409e56501f73281071a42a1e9bf56a28
+++ pidgin/win32/nsis/pidgin-installer.nsi	bd75d0bb7f8eaf9d0f53bad1bbec8e6b8650d2de
@@ -599,6 +599,7 @@ Section Uninstall
     Delete "$INSTDIR\plugins\ssl.dll"
     Delete "$INSTDIR\plugins\statenotify.dll"
     Delete "$INSTDIR\plugins\tcl.dll"
+    Delete "$INSTDIR\plugins\themeedit.dll"
     Delete "$INSTDIR\plugins\ticker.dll"
     Delete "$INSTDIR\plugins\timestamp.dll"
     Delete "$INSTDIR\plugins\timestamp_format.dll"
============================================================
--- pidgin/plugins/Makefile.mingw	f2daa4fdb76868c79c4eca2e2703bc8f8b8c1366
+++ pidgin/plugins/Makefile.mingw	8f20c1c701791b890fe31a267cbb4b6fd566f4e7
@@ -73,10 +73,19 @@ install: all $(PIDGIN_INSTALL_PLUGINS_DI
 	$(MAKE) -C $(WINPREFS_PLUGIN) -f $(MINGW_MAKEFILE) install
 	cp *.dll $(PIDGIN_INSTALL_PLUGINS_DIR)
 
+THEMEEDIT_SRC = themeedit.c themeedit-icon.c
+THEMEEDIT_OBJECTS = $(THEMEEDIT_SRC:%.c=%.o)
+
+themeedit.dll: $(THEMEEDIT_OBJECTS)
+	$(CC) -shared $(THEMEEDIT_OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $@
+
 %.dll: %.c $(PURPLE_CONFIG_H) $(PURPLE_VERSION_H)
 	$(CC) $(CFLAGS) $(DEFINES) $(INCLUDE_PATHS) -o $@.o -c $<
 	$(CC) -shared $@.o $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $@
 
+
+include $(PIDGIN_COMMON_RULES)
+
 plugins: \
 		convcolors.dll \
 		extplacement.dll \
@@ -89,6 +98,7 @@ plugins: \
 		relnot.dll \
 		sendbutton.dll \
 		spellchk.dll \
+		themeedit.dll \
 		timestamp_format.dll \
 		timestamp.dll \
 		xmppconsole.dll
============================================================
--- pidgin/plugins/themeedit.c	8040c6ce996163ba9d7015bfacc4d23e14a1961a
+++ pidgin/plugins/themeedit.c	a5e7c0f75f457036f15048f6c02845e00bc493de
@@ -268,8 +268,14 @@ pidgin_blist_theme_edit(PurplePluginActi
 
 	theme = pidgin_blist_get_theme();
 	if (!theme) {
+		const char *author;
+#ifndef _WIN32
+		author = getlogin();
+#else
+		author = "user";
+#endif
 		theme = g_object_new(PIDGIN_TYPE_BLIST_THEME, "type", "blist",
-				"author", getlogin(),
+				"author", author,
 				NULL);
 		pidgin_blist_set_theme(theme);
 	}
============================================================
--- pidgin/plugins/themeedit-icon.c	9677316c73fa0792d5a4feb32de6d14caeaab00e
+++ pidgin/plugins/themeedit-icon.c	e81f0f91dac0062c561692a8e39748b420a6ff10
@@ -106,9 +106,16 @@ create_icon_theme(GtkWidget *window)
 create_icon_theme(GtkWidget *window)
 {
 	int s, i, j;
-	char *dirname = "/tmp";   /* FIXME */
-	PidginStatusIconTheme *theme = g_object_new(PIDGIN_TYPE_STATUS_ICON_THEME, "type", "status-icon",
-				"author", getlogin(),
+	const char *dirname = g_get_tmp_dir();
+	PidginStatusIconTheme *theme;
+	const char *author;
+#ifndef _WIN32
+	author = getlogin();
+#else
+	author = "user";
+#endif
+	theme = g_object_new(PIDGIN_TYPE_STATUS_ICON_THEME, "type", "status-icon",
+				"author", author,
 				"directory", dirname,
 				NULL);