/pidgin/main: e271d89e5516: Merge
Andrew Victor
andrew.victor at mxit.com
Sat Sep 1 17:11:19 EDT 2012
Changeset: e271d89e55163c424c9922955ca9bb8fdf0dec31
Author: Andrew Victor <andrew.victor at mxit.com>
Date: 2012-09-01 22:46 +0200
Branch: mxit-2.x.y
URL: http://hg.pidgin.im/pidgin/main/rev/e271d89e5516
Description:
Merge
diffstat:
COPYRIGHT | 1 +
ChangeLog | 8 ++++++++
Makefile.mingw | 2 +-
finch/libgnt/Makefile.am | 2 +-
libpurple/media/enum-types.h | 12 ++++++------
libpurple/protocols/gg/gg.c | 11 +++++++++++
libpurple/protocols/jabber/Makefile.mingw | 2 +-
libpurple/protocols/silc/Makefile.mingw | 2 +-
libpurple/win32/global.mak | 4 ++--
pidgin/gtkconv.c | 26 ++++++++++++++------------
pidgin/gtkimhtml.h | 2 +-
pidgin/gtkstatusbox.c | 2 +-
pidgin/gtkutils.c | 12 ++++--------
pidgin/plugins/vvconfig.c | 2 ++
pidgin/win32/nsis/pidgin-installer.nsi | 4 ++--
15 files changed, 56 insertions(+), 36 deletions(-)
diffs (truncated from 376 to 300 lines):
diff --git a/COPYRIGHT b/COPYRIGHT
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -340,6 +340,7 @@ Greg McNew
Robert McQueen
Mihály Mészáros
Robert Mibus
+David Michael
Lars T. Mikkelsen
Benjamin Miller
Kevin Miller
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@ version 2.10.7:
Alien hatchery:
* No changes
+ Gadu-Gadu:
+ * Fix a crash at startup with large contact list. Avatar support for
+ buddies will be disabled till 3.0.0. (#15226, #14305)
+
MSN:
* Fix a crash when removing a user before its icon is loaded. (Mark
Barfield) (#15217)
@@ -12,6 +16,10 @@ version 2.10.7:
* Fix a double-free in profile/picture loading code. (Mihai Serban)
(#15053)
+ Plugins:
+ * The Voice/Video Settings plugin supports using the sndio GStreamer
+ backends. (Brad Smith) (#14414)
+
version 2.10.6 (07/06/2012):
Pidgin:
* Fix a bug that requires a triple-click to open a conversation
diff --git a/Makefile.mingw b/Makefile.mingw
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -66,7 +66,7 @@ EXTERNAL_DLLS = \
saslLOGIN.dll \
saslPLAIN.dll \
libsilc-1-1-2.dll \
- libsilcclient-1-1-2.dll \
+ libsilcclient-1-1-3.dll \
smime3.dll \
softokn3.dll \
sqlite3.dll \
diff --git a/finch/libgnt/Makefile.am b/finch/libgnt/Makefile.am
--- a/finch/libgnt/Makefile.am
+++ b/finch/libgnt/Makefile.am
@@ -84,7 +84,7 @@ libgnt_lainclude_HEADERS = \
$(libgnt_la_headers)
libgnt_la_DEPENDENCIES =
-libgnt_la_LDFLAGS = -export-dynamic -version_info $(GNT_LT_VERSION_INFO) -no-undefined
+libgnt_la_LDFLAGS = -export-dynamic -version-info $(GNT_LT_VERSION_INFO) -no-undefined
libgnt_la_LIBADD = \
$(GLIB_LIBS) \
$(GNT_LIBS) \
diff --git a/libpurple/media/enum-types.h b/libpurple/media/enum-types.h
--- a/libpurple/media/enum-types.h
+++ b/libpurple/media/enum-types.h
@@ -44,7 +44,7 @@ typedef enum {
PURPLE_MEDIA_CANDIDATE_TYPE_SRFLX,
PURPLE_MEDIA_CANDIDATE_TYPE_PRFLX,
PURPLE_MEDIA_CANDIDATE_TYPE_RELAY,
- PURPLE_MEDIA_CANDIDATE_TYPE_MULTICAST,
+ PURPLE_MEDIA_CANDIDATE_TYPE_MULTICAST
} PurpleMediaCandidateType;
/** Media caps */
@@ -56,14 +56,14 @@ typedef enum {
PURPLE_MEDIA_CAPS_VIDEO_SINGLE_DIRECTION = 1 << 3,
PURPLE_MEDIA_CAPS_AUDIO_VIDEO = 1 << 4,
PURPLE_MEDIA_CAPS_MODIFY_SESSION = 1 << 5,
- PURPLE_MEDIA_CAPS_CHANGE_DIRECTION = 1 << 6,
+ PURPLE_MEDIA_CAPS_CHANGE_DIRECTION = 1 << 6
} PurpleMediaCaps;
/** Media component types */
typedef enum {
PURPLE_MEDIA_COMPONENT_NONE = 0,
PURPLE_MEDIA_COMPONENT_RTP = 1,
- PURPLE_MEDIA_COMPONENT_RTCP = 2,
+ PURPLE_MEDIA_COMPONENT_RTCP = 2
} PurpleMediaComponentType;
/** Media info types */
@@ -76,13 +76,13 @@ typedef enum {
PURPLE_MEDIA_INFO_PAUSE,
PURPLE_MEDIA_INFO_UNPAUSE,
PURPLE_MEDIA_INFO_HOLD,
- PURPLE_MEDIA_INFO_UNHOLD,
+ PURPLE_MEDIA_INFO_UNHOLD
} PurpleMediaInfoType;
/** Media network protocols */
typedef enum {
PURPLE_MEDIA_NETWORK_PROTOCOL_UDP,
- PURPLE_MEDIA_NETWORK_PROTOCOL_TCP,
+ PURPLE_MEDIA_NETWORK_PROTOCOL_TCP
} PurpleMediaNetworkProtocol;
/** Media session types */
@@ -100,7 +100,7 @@ typedef enum {
typedef enum {
PURPLE_MEDIA_STATE_NEW = 0,
PURPLE_MEDIA_STATE_CONNECTED,
- PURPLE_MEDIA_STATE_END,
+ PURPLE_MEDIA_STATE_END
} PurpleMediaState;
/**
diff --git a/libpurple/protocols/gg/gg.c b/libpurple/protocols/gg/gg.c
--- a/libpurple/protocols/gg/gg.c
+++ b/libpurple/protocols/gg/gg.c
@@ -47,6 +47,8 @@
#include "buddylist.h"
#include "gg-utils.h"
+#define DISABLE_AVATARS 1
+
static PurplePlugin *my_protocol = NULL;
/* Prototypes */
@@ -903,6 +905,8 @@ static void ggp_rem_deny(PurpleConnectio
/* ----- INTERNAL CALLBACKS --------------------------------------------- */
/* ---------------------------------------------------------------------- */
+#if !DISABLE_AVATARS
+
struct gg_fetch_avatar_data
{
PurpleConnection *gc;
@@ -1037,6 +1041,8 @@ out:
g_free(bigavatar);
}
+#endif
+
/**
* Try to update avatar of the buddy.
*
@@ -1045,6 +1051,10 @@ out:
*/
static void ggp_update_buddy_avatar(PurpleConnection *gc, uin_t uin)
{
+#if DISABLE_AVATARS
+ purple_debug_warning("gg", "ggp_update_buddy_avatar: disabled, please "
+ "update to 3.0.0, when available\n");
+#else
gchar *avatarurl;
PurpleUtilFetchUrlData *url_data;
@@ -1058,6 +1068,7 @@ static void ggp_update_buddy_avatar(Purp
gg_get_avatar_url_cb, gc);
g_free(avatarurl);
+#endif
}
/**
diff --git a/libpurple/protocols/jabber/Makefile.mingw b/libpurple/protocols/jabber/Makefile.mingw
--- a/libpurple/protocols/jabber/Makefile.mingw
+++ b/libpurple/protocols/jabber/Makefile.mingw
@@ -105,7 +105,7 @@ LIBS = \
-lpurple
ifeq ($(CYRUS_SASL), 1)
-CYRUS_SASL_TOP := $(WIN32_DEV_TOP)/cyrus-sasl-2.1.22-daa1
+CYRUS_SASL_TOP := $(WIN32_DEV_TOP)/cyrus-sasl-2.1.25
INCLUDE_PATHS += -I$(CYRUS_SASL_TOP)/include
LIB_PATHS += -L$(CYRUS_SASL_TOP)/bin
LIBS += -llibsasl
diff --git a/libpurple/protocols/silc/Makefile.mingw b/libpurple/protocols/silc/Makefile.mingw
--- a/libpurple/protocols/silc/Makefile.mingw
+++ b/libpurple/protocols/silc/Makefile.mingw
@@ -11,7 +11,7 @@ DEFINES := $(subst -DWIN32_LEAN_AND_MEAN
TARGET = libsilc
NEEDED_DLLS = $(SILC_TOOLKIT)/bin/libsilc-1-1-2.dll \
- $(SILC_TOOLKIT)/bin/libsilcclient-1-1-2.dll
+ $(SILC_TOOLKIT)/bin/libsilcclient-1-1-3.dll
TYPE = PLUGIN
# Static or Plugin...
diff --git a/libpurple/win32/global.mak b/libpurple/win32/global.mak
--- a/libpurple/win32/global.mak
+++ b/libpurple/win32/global.mak
@@ -17,9 +17,9 @@ GTK_BIN ?= $(GTK_TOP)/bin
BONJOUR_TOP ?= $(WIN32_DEV_TOP)/Bonjour_SDK
LIBXML2_TOP ?= $(WIN32_DEV_TOP)/libxml2-2.7.4
MEANWHILE_TOP ?= $(WIN32_DEV_TOP)/meanwhile-1.0.2_daa2
-NSS_TOP ?= $(WIN32_DEV_TOP)/nss-3.12.5-nspr-4.8.2
+NSS_TOP ?= $(WIN32_DEV_TOP)/nss-3.13.6-nspr-4.9.2
PERL_LIB_TOP ?= $(WIN32_DEV_TOP)/perl-5.10.0
-SILC_TOOLKIT ?= $(WIN32_DEV_TOP)/silc-toolkit-1.1.8
+SILC_TOOLKIT ?= $(WIN32_DEV_TOP)/silc-toolkit-1.1.10
TCL_LIB_TOP ?= $(WIN32_DEV_TOP)/tcl-8.4.5
GSTREAMER_TOP ?= $(WIN32_DEV_TOP)/gstreamer-0.10.13
diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -8725,7 +8725,7 @@ notebook_release_cb(GtkWidget *widget, G
{
PidginWindow *dest_win;
GtkNotebook *dest_notebook;
- PurpleConversation *conv;
+ PidginConversation *active_gtkconv;
PidginConversation *gtkconv;
gint dest_page_num = 0;
gboolean new_window = FALSE;
@@ -8781,7 +8781,7 @@ notebook_release_cb(GtkWidget *widget, G
dest_win = pidgin_conv_window_get_at_xy(e->x_root, e->y_root);
- conv = pidgin_conv_window_get_active_conversation(win);
+ active_gtkconv = pidgin_conv_window_get_active_gtkconv(win);
if (dest_win == NULL) {
/* If the current window doesn't have any other conversations,
@@ -8835,7 +8835,7 @@ notebook_release_cb(GtkWidget *widget, G
}
}
- gtk_widget_grab_focus(PIDGIN_CONVERSATION(conv)->entry);
+ gtk_widget_grab_focus(active_gtkconv->entry);
return TRUE;
}
@@ -9380,6 +9380,17 @@ pidgin_conv_window_new()
void
pidgin_conv_window_destroy(PidginWindow *win)
{
+ PidginConversation *gtkconv;
+ GList *iter;
+
+ if (win->gtkconvs) {
+ for (iter = win->gtkconvs; iter != NULL; iter = iter->next) {
+ gtkconv = iter->data;
+ close_conv_cb(NULL, gtkconv);
+ }
+ return;
+ }
+
purple_prefs_disconnect_by_handle(win);
window_list = g_list_remove(window_list, win);
@@ -9387,15 +9398,6 @@ pidgin_conv_window_destroy(PidginWindow
if (win->dialogs.search)
gtk_widget_destroy(win->dialogs.search);
- if (win->gtkconvs) {
- while (win->gtkconvs) {
- gboolean last = (win->gtkconvs->next == NULL);
- close_conv_cb(NULL, win->gtkconvs->data);
- if (last)
- break;
- }
- return;
- }
gtk_widget_destroy(win->window);
g_object_unref(G_OBJECT(win->menu.item_factory));
diff --git a/pidgin/gtkimhtml.h b/pidgin/gtkimhtml.h
--- a/pidgin/gtkimhtml.h
+++ b/pidgin/gtkimhtml.h
@@ -239,7 +239,7 @@ typedef enum {
GTK_IMHTML_USE_POINTSIZE = 1 << 8,
GTK_IMHTML_NO_FORMATTING = 1 << 9,
GTK_IMHTML_USE_SMOOTHSCROLLING = 1 << 10,
- GTK_IMHTML_NO_SMILEY = 1 << 11,
+ GTK_IMHTML_NO_SMILEY = 1 << 11
} GtkIMHtmlOptions;
enum {
diff --git a/pidgin/gtkstatusbox.c b/pidgin/gtkstatusbox.c
--- a/pidgin/gtkstatusbox.c
+++ b/pidgin/gtkstatusbox.c
@@ -2020,7 +2020,7 @@ pidgin_status_box_size_allocate(GtkWidge
icon_alc = parent_alc;
icon_alc.height = MAX(1, icon_alc.height) - 2;
icon_alc.width = icon_alc.height;
- icon_alc.x = allocation->width - (icon_alc.width + border_width + 1);
+ icon_alc.x += allocation->width - (icon_alc.width + border_width + 1);
icon_alc.y += 1;
if (status_box->icon_size != icon_alc.height)
diff --git a/pidgin/gtkutils.c b/pidgin/gtkutils.c
--- a/pidgin/gtkutils.c
+++ b/pidgin/gtkutils.c
@@ -2256,7 +2256,7 @@ icon_filesel_choose_cb(GtkWidget *widget
static void
icon_preview_change_cb(GtkFileChooser *widget, struct _icon_chooser *dialog)
{
- GdkPixbuf *pixbuf, *scale;
+ GdkPixbuf *pixbuf;
int height, width;
More information about the Commits
mailing list