Mercurial > pidgin.yaz
changeset 15737:dad514810a45
merge of '27e68d8507710ccb8b38fc058029e663654dc591'
and 'b07dca81d01ea5e5f44ed9934aa21b754bf4a141'
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Mon, 26 Feb 2007 07:50:01 +0000 |
| parents | f322fa6c5318 (current diff) cf58d8ec3b0d (diff) |
| children | 20225df32b7e |
| files | |
| diffstat | 12 files changed, 72 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/COPYRIGHT Mon Feb 26 07:49:51 2007 +0000 +++ b/COPYRIGHT Mon Feb 26 07:50:01 2007 +0000 @@ -105,6 +105,7 @@ Stefan Esser Steffen Eschenbacher Marc Etcheverry +David Everly Larry Ewing Gábor Farkas Jesse Farmer
--- a/console/Makefile.am Mon Feb 26 07:49:51 2007 +0000 +++ b/console/Makefile.am Mon Feb 26 07:50:01 2007 +0000 @@ -1,5 +1,10 @@ if ENABLE_GNT +EXTRA_DIST = \ + getopt.c \ + getopt.h \ + getopt1.c + SUBDIRS = libgnt plugins bin_PROGRAMS = gaim-text
--- a/console/gntaccount.c Mon Feb 26 07:49:51 2007 +0000 +++ b/console/gntaccount.c Mon Feb 26 07:50:01 2007 +0000 @@ -594,6 +594,7 @@ break; } } + gaim_request_close_with_handle(account); /* Close any other opened delete window */ gaim_accounts_delete(account); } @@ -610,7 +611,6 @@ prompt = g_strdup_printf(_("Are you sure you want to delete %s?"), gaim_account_get_username(account)); - gaim_request_close_with_handle(account); /* Close any other opened delete window */ gaim_request_action(account, _("Delete Account"), prompt, NULL, 0, account, 2, _("Delete"), really_delete_account, _("Cancel"), NULL); g_free(prompt);
--- a/console/gntconn.c Mon Feb 26 07:49:51 2007 +0000 +++ b/console/gntconn.c Mon Feb 26 07:50:01 2007 +0000 @@ -22,7 +22,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "notify.h" +#include "account.h" +#include "core.h" +#include "request.h" #include "gntconn.h" #include "gntgaim.h" @@ -40,7 +42,11 @@ secondary = g_strdup_printf(_("%s was disconnected due to the following error:\n%s"), act, text); - gaim_notify_error(account, _("Connection Error"), primary, secondary); + gaim_request_action(account, _("Connection Error"), primary, secondary, 1, + account, 2, + _("OK"), NULL, + _("Connect"), + GAIM_CALLBACK(gaim_account_connect)); g_free(act); g_free(primary);
--- a/libpurple/protocols/jabber/jabber.c Mon Feb 26 07:49:51 2007 +0000 +++ b/libpurple/protocols/jabber/jabber.c Mon Feb 26 07:50:01 2007 +0000 @@ -283,7 +283,7 @@ sasl_encode(js->sasl, &data[pos], towrite, &out, &olen); pos += towrite; - if (js->writeh > 0) + if (js->writeh == 0) ret = jabber_do_send(js, out, olen); else { ret = -1;
--- a/libpurple/protocols/sametime/sametime.c Mon Feb 26 07:49:51 2007 +0000 +++ b/libpurple/protocols/sametime/sametime.c Mon Feb 26 07:50:01 2007 +0000 @@ -4810,13 +4810,13 @@ msg = gaim_markup_strip_html(message); if(conf) { - ret = ! mwConference_sendText(conf, message); + ret = ! mwConference_sendText(conf, msg); } else { struct mwPlace *place = ID_TO_PLACE(pd, id); g_return_val_if_fail(place != NULL, 0); - ret = ! mwPlace_sendText(place, message); + ret = ! mwPlace_sendText(place, msg); } g_free(msg);
--- a/libpurple/win32/win32dep.c Mon Feb 26 07:49:51 2007 +0000 +++ b/libpurple/win32/win32dep.c Mon Feb 26 07:50:01 2007 +0000 @@ -588,6 +588,8 @@ } /* DLL initializer */ +/* suppress gcc "no previous prototype" warning */ +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved); BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { libgaimdll_hInstance = hinstDLL; return TRUE;
--- a/pidgin/gtkaccount.c Mon Feb 26 07:49:51 2007 +0000 +++ b/pidgin/gtkaccount.c Mon Feb 26 07:50:01 2007 +0000 @@ -2577,8 +2577,9 @@ default_avatar = NULL; } } - + gaim_prefs_add_path("/gaim/gtk/accounts/buddyicon", default_avatar); + g_free(default_avatar); gaim_signal_register(pidgin_account_get_handle(), "account-modified", gaim_marshal_VOID__POINTER, NULL, 1,
--- a/pidgin/gtknotify.c Mon Feb 26 07:49:51 2007 +0000 +++ b/pidgin/gtknotify.c Mon Feb 26 07:50:01 2007 +0000 @@ -307,6 +307,13 @@ (url == NULL ? NULL : &url)); } +static int +mail_window_focus_cb(GtkWidget *widget, GdkEventFocus *focus, gpointer null) +{ + pidgin_set_urgent(GTK_WINDOW(widget), FALSE); + return 0; +} + static GtkWidget * pidgin_get_mail_dialog() { @@ -323,6 +330,8 @@ GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); gtk_window_set_role(GTK_WINDOW(dialog), "new_mail_detailed"); + g_signal_connect(G_OBJECT(dialog), "focus-in-event", + G_CALLBACK(mail_window_focus_cb), NULL); gtk_dialog_add_button(GTK_DIALOG(dialog), _("Open All Messages"), GTK_RESPONSE_ACCEPT); @@ -521,7 +530,8 @@ g_free(label_text); if (pixbuf) g_object_unref(pixbuf); - } + } else if (!GTK_WIDGET_HAS_FOCUS(dialog)) + pidgin_set_urgent(GTK_WINDOW(dialog), TRUE); return NULL; }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/tray/22/Makefile.mingw Mon Feb 26 07:50:01 2007 +0000 @@ -0,0 +1,20 @@ +# +# Makefile.mingw +# +# Description: Makefile for win32 (mingw) version of Pidgin pixmaps +# + +GAIM_TOP := ../../../.. +include $(GAIM_TOP)/libpurple/win32/global.mak + +datadir = $(GAIM_INSTALL_DIR) +include ./Makefile.am + +.PHONY: install + +install: + if test '$(pidgintraypix_DATA)'; then \ + mkdir -p $(pidgintraypixdir); \ + cp $(pidgintraypix_DATA) $(pidgintraypixdir); \ + fi; +
--- a/pidgin/pixmaps/tray/Makefile.am Mon Feb 26 07:49:51 2007 +0000 +++ b/pidgin/pixmaps/tray/Makefile.am Mon Feb 26 07:50:01 2007 +0000 @@ -1,1 +1,6 @@ SUBDIRS = 22 + +EXTRA_DIST = \ + Makefile.mingw \ + 22/Makefile.mingw +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/tray/Makefile.mingw Mon Feb 26 07:50:01 2007 +0000 @@ -0,0 +1,14 @@ +# +# Makefile.mingw +# +# Description: Makefile for win32 (mingw) version of Gaim pixmaps +# + +include ./Makefile.am + +install: + if test '$(SUBDIRS)'; then \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \ + done; \ + fi;