/pidgin/main: 7b12c4d2c6d7: Merge with release-2.x.y.
Elliott Sales de Andrade
qulogic at pidgin.im
Fri Aug 17 00:31:10 EDT 2012
Changeset: 7b12c4d2c6d78901c4b01adcd73dafb0d3a59466
Author: Elliott Sales de Andrade <qulogic at pidgin.im>
Date: 2012-08-17 00:28 -0400
Branch: default
URL: http://hg.pidgin.im/pidgin/main/rev/7b12c4d2c6d7
Description:
Merge with release-2.x.y.
diffstat:
COPYRIGHT | 1 +
ChangeLog | 10 ++++++++--
libpurple/media/enum-types.h | 12 ++++++------
pidgin/gtkconv.c | 26 ++++++++++++++------------
pidgin/gtkimhtml.h | 2 +-
pidgin/gtkstatusbox.c | 2 +-
6 files changed, 31 insertions(+), 22 deletions(-)
diffs (183 lines):
diff --git a/COPYRIGHT b/COPYRIGHT
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -342,6 +342,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
@@ -49,8 +49,6 @@ version 3.0.0 (??/??/????):
* Invalid user moods can no longer be sent to the server.
Plugins:
- * The Voice/Video Settings plugin supports using the sndio GStreamer
- backends. (Brad Smith) (#14414)
* The Offline Message Emulation plugin now adds a note that the message
was an offline message. (Flavius Anton) (#2497)
@@ -59,6 +57,10 @@ version 2.10.7:
* Fix a crash at startup with large contact list. Avatar support for
buddies will be disabled till 3.0.0. (#15226, #14305)
+ 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)
@@ -67,6 +69,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/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/pidgin/gtkconv.c b/pidgin/gtkconv.c
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -9344,7 +9344,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;
@@ -9411,7 +9411,7 @@ notebook_release_cb(GtkWidget *widget, G
dest_win = pidgin_conv_window_get_at_event((GdkEvent *)e);
- 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,
@@ -9465,7 +9465,7 @@ notebook_release_cb(GtkWidget *widget, G
}
}
- gtk_widget_grab_focus(PIDGIN_CONVERSATION(conv)->entry);
+ gtk_widget_grab_focus(active_gtkconv->entry);
return TRUE;
}
@@ -10094,18 +10094,20 @@ 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);
- 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->notebook_menu);
gtk_widget_destroy(win->window);
diff --git a/pidgin/gtkimhtml.h b/pidgin/gtkimhtml.h
--- a/pidgin/gtkimhtml.h
+++ b/pidgin/gtkimhtml.h
@@ -171,7 +171,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
@@ -2097,7 +2097,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)
More information about the Commits
mailing list