Mercurial > pidgin.yaz
changeset 21561:7109257d4612
merge of '1084824bf3739139306602c736073dd294ca4206'
and '3168753fae3715f5af1b820af8546d12810d704e'
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Sat, 17 Nov 2007 00:56:02 +0000 |
| parents | 665e04562de0 (current diff) ab6212eae70f (diff) |
| children | 926970c64bd2 |
| files | ChangeLog libpurple/certificate.c libpurple/protocols/jabber/si.c |
| diffstat | 14 files changed, 35 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Nov 17 00:12:30 2007 +0000 +++ b/ChangeLog Sat Nov 17 00:56:02 2007 +0000 @@ -3,7 +3,7 @@ version 2.3.0: http://developer.pidgin.im/query?status=closed&milestone=2.3.0 NOTE: Some bugs marked fixed in 2.2.1, 2.2.2 or 2.2.3 may not - have been fixed until this release (2.2.3). + have been fixed until this release (2.3.0). libpurple: * Real usernames are now shown in the system log. @@ -20,6 +20,8 @@ remove the plugin from the list of saved plugins so it won't load at the next startup. Previously, we were ignoring this case, which could lead to crashes. + * Mark dialog windows as transient for appropriate parent windows to + help window managers do the right thing (Gabriel Schulhof) * Connection errors are now reported in mini-dialogs inside the buddy list, rather than as buttons in the buddy list and with dialog boxes. If several accounts are disabled when you sign on elsewhere,
--- a/libpurple/Makefile.mingw Sat Nov 17 00:12:30 2007 +0000 +++ b/libpurple/Makefile.mingw Sat Nov 17 00:56:02 2007 +0000 @@ -119,7 +119,7 @@ sed -e 's/@PURPLE_VERSION@/$(PURPLE_VERSION)/g' \ $@.in > $@ -$(OBJECTS): $(PURPLE_CONFIG_H) $(PURPLE_VERSION_H) +$(OBJECTS): $(PURPLE_CONFIG_H) $(PURPLE_VERSION_H) $(PURPLE_PURPLE_H) $(TARGET).dll $(TARGET).dll.a: $(OBJECTS) $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--output-def,$(TARGET).def,--out-implib,$(TARGET).dll.a -o $(TARGET).dll
--- a/libpurple/certificate.c Sat Nov 17 00:12:30 2007 +0000 +++ b/libpurple/certificate.c Sat Nov 17 00:56:02 2007 +0000 @@ -1357,6 +1357,7 @@ /* Okay, we're done here */ purple_certificate_verify_complete(vrq, PURPLE_CERTIFICATE_INVALID); + return; } /* if (signature chain not good) */ /* Next, attempt to verify the last certificate against a CA */
--- a/libpurple/plugins/perl/common/PluginPref.xs Sat Nov 17 00:12:30 2007 +0000 +++ b/libpurple/plugins/perl/common/PluginPref.xs Sat Nov 17 00:56:02 2007 +0000 @@ -93,6 +93,10 @@ purple_plugin_pref_get_masked(pref) Purple::PluginPref pref +Purple::String::Format::Type +purple_plugin_pref_get_format_type(pref) + Purple::PluginPref pref + unsigned int purple_plugin_pref_get_max_length(pref) Purple::PluginPref pref @@ -145,6 +149,11 @@ gboolean mask void +purple_plugin_pref_set_format_type(pref, format) + Purple::PluginPref pref + Purple::String::Format::Type format + +void purple_plugin_pref_set_max_length(pref, max_length) Purple::PluginPref pref unsigned int max_length
--- a/libpurple/plugins/perl/common/module.h Sat Nov 17 00:12:30 2007 +0000 +++ b/libpurple/plugins/perl/common/module.h Sat Nov 17 00:56:02 2007 +0000 @@ -197,6 +197,7 @@ typedef PurplePluginPref * Purple__PluginPref; typedef PurplePluginPrefFrame * Purple__PluginPref__Frame; typedef PurplePluginPrefType Purple__PluginPrefType; +typedef PurpleStringFormatType Purple__String__Format__Type; /* pounce.h */ typedef PurplePounce * Purple__Pounce;
--- a/libpurple/plugins/perl/common/typemap Sat Nov 17 00:12:30 2007 +0000 +++ b/libpurple/plugins/perl/common/typemap Sat Nov 17 00:56:02 2007 +0000 @@ -158,6 +158,7 @@ const Purple::StatusType T_PurpleObj Purple::StoredImage T_PurpleObj +Purple::String::Format::Type T_IV Purple::Stringref T_PurpleObj Purple::Util::FetchUrlData T_PTR Purple::Util::InfoFieldFormatCallback T_PTR
--- a/libpurple/protocols/bonjour/jabber.c Sat Nov 17 00:12:30 2007 +0000 +++ b/libpurple/protocols/bonjour/jabber.c Sat Nov 17 00:56:02 2007 +0000 @@ -1049,7 +1049,7 @@ ((add >> 16) & 255), ((add >> 8) & 255), add & 255); - tip = (char*) ((int) tip + len); + tip = &tip[len]; count++; continue; }
--- a/libpurple/protocols/bonjour/mdns_howl.c Sat Nov 17 00:12:30 2007 +0000 +++ b/libpurple/protocols/bonjour/mdns_howl.c Sat Nov 17 00:56:02 2007 +0000 @@ -115,7 +115,7 @@ { sw_discovery_resolve_id rid; PurpleAccount *account = (PurpleAccount*)extra; - PurpleBuddy *0b = NULL; + PurpleBuddy *pb = NULL; switch (status) {
--- a/libpurple/protocols/jabber/si.c Sat Nov 17 00:12:30 2007 +0000 +++ b/libpurple/protocols/jabber/si.c Sat Nov 17 00:56:02 2007 +0000 @@ -824,6 +824,7 @@ do_transfer_send(xfer, resource); g_free(resource); + return; } jb = jabber_buddy_find(jsx->js, xfer->who, TRUE);
--- a/libpurple/win32/libc_interface.c Sat Nov 17 00:12:30 2007 +0000 +++ b/libpurple/win32/libc_interface.c Sat Nov 17 00:56:02 2007 +0000 @@ -300,7 +300,9 @@ return errbuf; } else - return g_strerror( errornum ); + /* Nothing is supposed to modify what is returned by strerror, + but it isn't const for some reason */ + return (char *)g_strerror( errornum ); } /* unistd.h */
--- a/libpurple/win32/targets.mak Sat Nov 17 00:12:30 2007 +0000 +++ b/libpurple/win32/targets.mak Sat Nov 17 00:56:02 2007 +0000 @@ -9,7 +9,7 @@ sed -e 's/@VERSION@/$(PIDGIN_VERSION)/; s/@DISPLAY_VERSION@/$(DISPLAY_VERSION)/' $@.mingw > $@ $(PURPLE_PURPLE_H): $(PURPLE_PURPLE_H).in - sed -e 's/@PLUGINS_DEFINE@/#define PURPLE_PLUGINS 1/; $@.in > $@ + sed -e 's/@PLUGINS_DEFINE@/#define PURPLE_PLUGINS 1/' $@.in > $@ $(PURPLE_VERSION_H): $(PURPLE_VERSION_H).in $(PIDGIN_TREE_TOP)/configure.ac cp $@.in $@
--- a/pidgin/Makefile.am Sat Nov 17 00:12:30 2007 +0000 +++ b/pidgin/Makefile.am Sat Nov 17 00:56:02 2007 +0000 @@ -206,6 +206,8 @@ -DSYSCONFDIR=\"$(sysconfdir)\" \ -I$(top_builddir)/libpurple \ -I$(top_srcdir)/libpurple/ \ + -I$(top_builddir) \ + -I$(top_srcdir) \ $(GLIB_CFLAGS) \ $(GSTREAMER_CFLAGS) \ $(DEBUG_CFLAGS) \
--- a/pidgin/gtkimhtml.c Sat Nov 17 00:12:30 2007 +0000 +++ b/pidgin/gtkimhtml.c Sat Nov 17 00:56:02 2007 +0000 @@ -899,6 +899,9 @@ if (primary) { GtkTextMark *sel = NULL, *ins = NULL; + + g_return_if_fail(imhtml != NULL); + ins = gtk_text_buffer_get_insert(imhtml->text_buffer); sel = gtk_text_buffer_get_selection_bound(imhtml->text_buffer); gtk_text_buffer_get_iter_at_mark(imhtml->text_buffer, &start, sel); @@ -957,7 +960,6 @@ static void gtk_imhtml_clipboard_clear (GtkClipboard *clipboard, GtkSelectionData *sel_data, guint info, gpointer user_data_or_owner) { - clipboard_selection = NULL; } static void copy_clipboard_cb(GtkIMHtml *imhtml, gpointer unused)
--- a/po/de.po Sat Nov 17 00:12:30 2007 +0000 +++ b/po/de.po Sat Nov 17 00:56:02 2007 +0000 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-11-15 22:50+0100\n" -"PO-Revision-Date: 2007-11-15 23:00+0100\n" +"POT-Creation-Date: 2007-11-17 00:48+0100\n" +"PO-Revision-Date: 2007-11-17 00:44+0100\n" "Last-Translator: Bjoern Voigt <bjoern@cs.tu-berlin.de>\n" "Language-Team: Deutsch <de@li.org>\n" "MIME-Version: 1.0\n" @@ -1458,7 +1458,7 @@ msgstr "SSL-Zertifikatfehler" msgid "Invalid certificate chain" -msgstr "Ungültige Zertifizierungskette" +msgstr "Ungültige Zertifikationskette" #. vrq will be completed by user_auth msgid "" @@ -1962,7 +1962,7 @@ "Automatisch akzeptierte Übertragung der Datei „%s“ von „%s“ abgeschlossen." msgid "Autoaccept complete" -msgstr "Auto-Akzeptieren fertig" +msgstr "Autoaccept fertig" #, c-format msgid "When a file-transfer request arrives from %s" @@ -3495,7 +3495,7 @@ msgstr "Mehrbenutzer-Chat" msgid "Multi-User Chat Extended Presence Information" -msgstr "Erweiterte Anwesenheitsinformation im Mehrbenutzer-Chat " +msgstr "Erweiterte Anwesenheitsinformation im Mehrbenutzer-Chat" msgid "In-Band Bytestreams" msgstr "Bandinterner Bytestrom(" @@ -8889,7 +8889,7 @@ #, c-format msgid "%s has sent you a webcam invite, which is not yet supported." msgstr "" -"%s hat Ihnen eine Webcam-Einladung gesendet, die noch nicht unterstützt wird." +"%s hat Ihnen eine Webcam-Einladung gesenden, die noch nicht unterstützt wird." msgid "Your Yahoo! message did not get sent." msgstr "Ihre Yahoo!-Nachricht wurde nicht verschickt." @@ -10183,7 +10183,7 @@ msgstr "Bitte geben Sie den Namen der Gruppe ein, die hinzugefügt werden soll." msgid "<PurpleMain>/Accounts/" -msgstr "<PurpleMain>/Konten" +msgstr "<PurpleMain>/Konten/" msgid "_Edit Account" msgstr "Konto _bearbeiten"