Mercurial > pidgin
changeset 16624:787d57d5d6ed
merge of '61d3a51c5b0dba085ac1743886e687ba8d84d12d'
and '8f7c67720e5712f4a88ea92a2fed9d902b961335'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sun, 29 Apr 2007 04:10:07 +0000 |
| parents | 112fa61799f4 (current diff) 36a87fb00a22 (diff) |
| children | a86d398435ea |
| files | |
| diffstat | 4 files changed, 13 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/buddyicon.c Sun Apr 29 04:09:40 2007 +0000 +++ b/libpurple/buddyicon.c Sun Apr 29 04:10:07 2007 +0000 @@ -727,7 +727,7 @@ if (old_img) purple_imgstore_unref(old_img); - else + else if (old_icon) { /* The old icon may not have been loaded into memory. In that * case, we'll need to uncache the filename. The filenames
--- a/libpurple/protocols/msn/slp.c Sun Apr 29 04:09:40 2007 +0000 +++ b/libpurple/protocols/msn/slp.c Sun Apr 29 04:10:07 2007 +0000 @@ -955,7 +955,7 @@ if (obj == NULL) { -/* purple_buddy_icons_set_for_user(account, user->passport, NULL, 0, NULL); */ + purple_buddy_icons_set_for_user(account, user->passport, NULL, 0, NULL); return; }
--- a/libpurple/win32/targets.mak Sun Apr 29 04:09:40 2007 +0000 +++ b/libpurple/win32/targets.mak Sun Apr 29 04:10:07 2007 +0000 @@ -8,7 +8,7 @@ $(PIDGIN_CONFIG_H): $(PIDGIN_TREE_TOP)/config.h.mingw cp $(PIDGIN_TREE_TOP)/config.h.mingw $(PIDGIN_CONFIG_H) -$(PURPLE_VERSION_H): $(PURPLE_VERSION_H).in +$(PURPLE_VERSION_H): $(PURPLE_VERSION_H).in $(PIDGIN_TREE_TOP)/configure.ac cp $(PURPLE_VERSION_H).in $(PURPLE_VERSION_H) awk 'BEGIN {FS="[\\(\\)\\[\\]]"} \ /^m4_define..purple_major_version/ {system("sed -i -e s/@PURPLE_MAJOR_VERSION@/"$$5"/ $(PURPLE_VERSION_H)");} \
--- a/pidgin/gtkrequest.c Sun Apr 29 04:09:40 2007 +0000 +++ b/pidgin/gtkrequest.c Sun Apr 29 04:10:07 2007 +0000 @@ -472,7 +472,9 @@ if (title != NULL) gtk_window_set_title(GTK_WINDOW(dialog), title); - +#ifdef _WIN32 + gtk_window_set_title(GTK_WINDOW(dialog), PIDGIN_ALERT_TITLE); +#endif gtk_dialog_add_button(GTK_DIALOG(dialog), text_to_stock(cancel_text), 0); @@ -580,6 +582,9 @@ if (title != NULL) gtk_window_set_title(GTK_WINDOW(dialog), title); +#ifdef _WIN32 + gtk_window_set_title(GTK_WINDOW(dialog), PIDGIN_ALERT_TITLE); +#endif for (i = 0; i < action_count; i++) { gtk_dialog_add_button(GTK_DIALOG(dialog), @@ -1068,6 +1073,9 @@ if (title != NULL) gtk_window_set_title(GTK_WINDOW(win), title); +#ifdef _WIN32 + gtk_window_set_title(GTK_WINDOW(win), PIDGIN_ALERT_TITLE); +#endif gtk_window_set_role(GTK_WINDOW(win), "multifield"); gtk_container_set_border_width(GTK_CONTAINER(win), PIDGIN_HIG_BORDER); @@ -1609,7 +1617,7 @@ data->cbs[0] = cancel_cb; data->cbs[1] = ok_cb; data->u.file.savedialog = FALSE; - + #if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */ dirsel = gtk_file_chooser_dialog_new( title ? title : _("Select Folder..."),