Mercurial > pidgin
changeset 30905:58b013a3a2d4
merge of '2dfb64bc744cbdfa05ad4ebc9d940e9f078650ef'
and 'a8840dd42182ddf786129279eef4a242de2fcd7b'
| author | ivan.komarov@soc.pidgin.im |
|---|---|
| date | Fri, 05 Nov 2010 00:38:46 +0000 |
| parents | 52dbbedb4908 (diff) 91d3b40a2f70 (current diff) |
| children | 6d99f7cdc654 |
| files | |
| diffstat | 5 files changed, 29 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/msn/switchboard.c Fri Nov 05 00:37:23 2010 +0000 +++ b/libpurple/protocols/msn/switchboard.c Fri Nov 05 00:38:46 2010 +0000 @@ -325,9 +325,8 @@ for (l = swboard->users; l != NULL; l = l->next) { const char *tmp_user; - user = l->data; - tmp_user = msnuser->passport; + tmp_user = ((MsnUser*)l->data)->passport; purple_conv_chat_add_user(PURPLE_CONV_CHAT(swboard->conv), tmp_user, NULL, PURPLE_CBFLAGS_NONE, TRUE);
--- a/pidgin/plugins/Makefile.mingw Fri Nov 05 00:37:23 2010 +0000 +++ b/pidgin/plugins/Makefile.mingw Fri Nov 05 00:38:46 2010 +0000 @@ -73,10 +73,19 @@ $(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 @@ relnot.dll \ sendbutton.dll \ spellchk.dll \ + themeedit.dll \ timestamp_format.dll \ timestamp.dll \ xmppconsole.dll
--- a/pidgin/plugins/themeedit-icon.c Fri Nov 05 00:37:23 2010 +0000 +++ b/pidgin/plugins/themeedit-icon.c Fri Nov 05 00:38:46 2010 +0000 @@ -106,9 +106,16 @@ 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);
--- a/pidgin/plugins/themeedit.c Fri Nov 05 00:37:23 2010 +0000 +++ b/pidgin/plugins/themeedit.c Fri Nov 05 00:38:46 2010 +0000 @@ -268,8 +268,14 @@ 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); }
--- a/pidgin/win32/nsis/pidgin-installer.nsi Fri Nov 05 00:37:23 2010 +0000 +++ b/pidgin/win32/nsis/pidgin-installer.nsi Fri Nov 05 00:38:46 2010 +0000 @@ -599,6 +599,7 @@ 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"