/soc/2012/michael/android: af1a4f6d8da2: merged with main#default
Michael Zangl
michael at soc.pidgin.im
Wed Aug 15 06:34:40 EDT 2012
Changeset: af1a4f6d8da2bb3aed9b5323365b16bf1e483d4f
Author: Michael Zangl <michael at soc.pidgin.im>
Date: 2012-08-15 12:26 +0200
Branch: soc.2012.android
URL: http://hg.pidgin.im/soc/2012/michael/android/rev/af1a4f6d8da2
Description:
merged with main#default
diffstat:
COPYRIGHT | 3 +-
ChangeLog | 20 +
README | 4 +-
README.MTN | 6 +-
README.mingw | 2 +-
config.h.mingw | 3 -
configure.ac | 96 +-
doc/pidgin.1.in | 4 +-
finch/gntrequest.c | 7 +-
finch/libgnt/Makefile.am | 2 +-
libpurple/accountopt.c | 42 +-
libpurple/accountopt.h | 25 +-
libpurple/mediamanager.c | 9 +-
libpurple/plugins/perl/common/AccountOpts.xs | 4 +-
libpurple/protocols/msn/userlist.c | 1 +
libpurple/protocols/yahoo/yahoo_picture.c | 3 -
libpurple/protocols/yahoo/yahoo_profile.c | 4 -
libpurple/request.c | 238 ++++-
libpurple/request.h | 120 ++-
libpurple/util.c | 12 +-
pidgin/gtk3compat.h | 173 +++
pidgin/gtkaccount.c | 87 +-
pidgin/gtkblist-theme-loader.c | 2 +
pidgin/gtkblist.c | 436 ++++++--
pidgin/gtkblist.h | 8 +-
pidgin/gtkcellrendererexpander.c | 145 ++-
pidgin/gtkcertmgr.c | 4 +
pidgin/gtkconv.c | 1008 +++++++++++--------
pidgin/gtkconv.h | 1 -
pidgin/gtkconvwin.h | 2 +
pidgin/gtkdebug.c | 768 +++++---------
pidgin/gtkdialogs.c | 47 +-
pidgin/gtkdialogs.h | 3 -
pidgin/gtkdnd-hints.c | 82 +-
pidgin/gtkdocklet.c | 61 +-
pidgin/gtkdocklet.h | 5 +
pidgin/gtkft.c | 31 +-
pidgin/gtkimhtml.c | 287 +++-
pidgin/gtkimhtml.h | 6 +-
pidgin/gtkimhtmltoolbar.c | 105 +-
pidgin/gtklog.c | 18 +-
pidgin/gtkmedia.c | 12 +-
pidgin/gtkmenutray.c | 74 +-
pidgin/gtkmenutray.h | 3 -
pidgin/gtknotify.c | 41 +-
pidgin/gtkplugin.c | 30 +-
pidgin/gtkpluginpref.c | 45 +-
pidgin/gtkpounce.c | 69 +-
pidgin/gtkprefs.c | 34 +-
pidgin/gtkprivacy.c | 10 +-
pidgin/gtkrequest.c | 147 +-
pidgin/gtkroomlist.c | 74 +-
pidgin/gtksavedstatuses.c | 38 +-
pidgin/gtkscrollbook.c | 4 +-
pidgin/gtksession.c | 4 +-
pidgin/gtksmiley.c | 21 +-
pidgin/gtksourceundomanager.c | 2 +
pidgin/gtkstatusbox.c | 562 ++++++----
pidgin/gtkstatusbox.h | 6 +-
pidgin/gtkthemes.c | 46 +-
pidgin/gtkutils.c | 355 ++----
pidgin/gtkutils.h | 31 +-
pidgin/gtkwebview.c | 1311 ++++++++++++++++++++++++-
pidgin/gtkwebview.h | 186 +++-
pidgin/gtkwebviewtoolbar.c | 233 +++-
pidgin/gtkwebviewtoolbar.h | 30 +
pidgin/gtkwhiteboard.c | 152 +-
pidgin/gtkwhiteboard.h | 21 +-
pidgin/minidialog.c | 7 +-
pidgin/pidginstock.c | 9 +-
pidgin/pidgintooltip.c | 30 +-
pidgin/pidgintooltip.h | 4 +-
pidgin/plugins/contact_priority.c | 11 +-
pidgin/plugins/convcolors.c | 4 +-
pidgin/plugins/disco/gtkdisco.c | 18 +-
pidgin/plugins/gestures/stroke-draw.c | 22 +-
pidgin/plugins/history.c | 3 +
pidgin/plugins/perl/common/Makefile.PL.in | 2 +-
pidgin/plugins/themeedit.c | 3 -
pidgin/plugins/ticker/gtkticker.c | 187 ++-
pidgin/plugins/timestamp.c | 2 +-
pidgin/plugins/timestamp_format.c | 2 +-
pidgin/plugins/vvconfig.c | 8 +-
pidgin/plugins/xmppconsole.c | 74 +-
po/de.po | 14 +-
85 files changed, 5234 insertions(+), 2591 deletions(-)
diffs (truncated from 14680 to 300 lines):
diff --git a/COPYRIGHT b/COPYRIGHT
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -15,7 +15,7 @@ If concerns are raised as to the copyrig
piece of code, then that code should be traced through our version
control system to see from where it came and who has modified it.
-Copyright (C) 1998-2011 by the following:
+Copyright (C) 1998-2012 by the following:
Saleem Abdulrasool
Jakub Adam
@@ -40,6 +40,7 @@ R. Tyler Ballance
Chris Banal
Luca Barbato
Levi Bard
+Mark Barfield
Ryan Barrett
Kevin Barry
Lukas Barth
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
version 3.0.0 (??/??/????):
+ Pidgin:
+ * Support building with the GTK+ 3.x toolkit. When configuring the
+ build, use --with-gtk=<2|3> to determine which toolkit to use. Using
+ either 2 or 3 will attempt to build with specifically 2.x or 3.x
+ support. The default is 'auto', which will first look for 3.x
+ development headers and then 2.x development headers.
+
Finch:
* Support the conversation-extended signal for extending the
conversation menu. (Howard Chu) (#14818)
@@ -47,6 +54,19 @@ version 3.0.0 (??/??/????):
* The Offline Message Emulation plugin now adds a note that the message
was an offline message. (Flavius Anton) (#2497)
+version 2.10.7:
+ 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)
+
+ Yahoo!:
+ * Fix a double-free in profile/picture loading code. (Mihai Serban)
+ (#15053)
+
version 2.10.6 (07/06/2012):
Pidgin:
* Fix a bug that requires a triple-click to open a conversation
diff --git a/README b/README
--- a/README
+++ b/README
@@ -6,7 +6,7 @@ libpurple is a library intended to be us
to write an IM client that connects to many IM networks. It supports
AIM, ICQ, XMPP, MSN and Yahoo!, among others.
-Pidgin is an graphical IM client written in C which uses the GTK+
+Pidgin is a graphical IM client written in C which uses the GTK+
toolkit.
Finch is a text-based IM client written in C which uses the ncurses
@@ -43,7 +43,7 @@ you only need to run 'pidgin' or 'finch'
To get started, simply add a new account.
-If you come across a bug, please report it at: http://pidgin.im
+If you come across a bug, please report it at: http://developer.pidgin.im
PLUGINS
=======
diff --git a/README.MTN b/README.hg
rename from README.MTN
rename to README.hg
--- a/README.MTN
+++ b/README.hg
@@ -1,13 +1,13 @@
-If you plan to use Pidgin, Finch and libpurple from our Monotone repository,
+If you plan to use Pidgin, Finch and libpurple from our Mercurial repository,
PLEASE read this message in its entirety!
Pidgin, Finch, and libpurple are a fast-moving project with a somewhat regular
-release schedule. Due to the rate of development, the code in our Monotone
+release schedule. Due to the rate of development, the code in our Mercurial
repository undergoes frequent bursts of massive changes, often leaving behind
brokenness and partial functionality while the responsible developers rewrite
some portion of code or seek to add new features.
-What this all boils down to is that the code in our Monotone repository _WILL_
+What this all boils down to is that the code in our Mercurial repository _WILL_
sometimes be broken. Because of this, we ask that users who are not interested
in personally tracking down bugs and fixing them (without a lot of
assistance from the developers!) use only released versions. Since releases
diff --git a/README.mingw b/README.mingw
--- a/README.mingw
+++ b/README.mingw
@@ -1,5 +1,5 @@
How to build Pidgin for Windows using MinGW
-=============================
+===========================================
For the latest build instructions, please refer to:
diff --git a/config.h.mingw b/config.h.mingw
--- a/config.h.mingw
+++ b/config.h.mingw
@@ -180,9 +180,6 @@
/* Define to 1 if you have the `random' function. */
/* #define HAVE_RANDOM 1 */
-/* Define to 1 if you have the <regex.h> header file. */
-/* #define HAVE_REGEX_H 1 */
-
/* Define to 1 if you have the `setlocale' function. */
#define HAVE_SETLOCALE 1
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -123,7 +123,7 @@ AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"
dnl Checks for header files.
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(arpa/nameser_compat.h fcntl.h sys/time.h unistd.h locale.h signal.h stdint.h regex.h)
+AC_CHECK_HEADERS(arpa/nameser_compat.h fcntl.h sys/time.h unistd.h locale.h signal.h stdint.h)
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
@@ -372,6 +372,9 @@ AC_ARG_WITH(x, [],
AC_ARG_ENABLE(gtkui, [AC_HELP_STRING([--disable-gtkui],
[compile without GTK+ user interface])],
enable_gtkui="$enableval", enable_gtkui="yes")
+AC_ARG_WITH(gtk, [AC_HELP_STRING([--with-gtk=<version>],
+ [compile with GTK+ 2 or 3 user interface (default: auto)])],
+ with_gtk="$withval", with_gtk="auto")
AC_ARG_ENABLE(consoleui, [AC_HELP_STRING([--disable-consoleui],
[compile without console user interface])],
[enable_consoleui=$enableval force_finch=$enableval], [enable_consoleui=yes force_finch=no])
@@ -428,15 +431,35 @@ else
fi
if test "x$enable_gtkui" = "xyes" ; then
- PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.10.0], , [
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([
-
+ if test "x$with_gtk" = "x3"; then
+ PKG_CHECK_MODULES(GTK, [gtk+-3.0 >= 3.0.0], , [
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([
+You must have GTK+ 3.0.0 or newer development headers installed to compile
+Pidgin. If you want to build only Finch then specify --disable-gtkui when
+running configure.
+])])
+ elif test "x$with_gtk" = "x2"; then
+ PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.10.0], , [
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([
You must have GTK+ 2.10.0 or newer development headers installed to compile
Pidgin. If you want to build only Finch then specify --disable-gtkui when
running configure.
])])
-
+ elif test "x$with_gtk" = "xauto"; then
+ PKG_CHECK_MODULES(GTK, [gtk+-3.0 >= 3.0.0], [with_gtk=3], [
+ AC_MSG_RESULT(no)
+ PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.10.0], [with_gtk=2], [
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([
+You must have GTK+ 2.10.0 or newer development headers installed to compile
+Pidgin. If you want to build only Finch then specify --disable-gtkui when
+running configure.
+])])])
+ else
+ AC_MSG_ERROR([--with-gtk must specify one of 2, 3 or auto.])
+ fi
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
@@ -444,13 +467,24 @@ running configure.
PKG_CHECK_MODULES(PANGO, [pango >= 1.4.0],
AC_DEFINE(HAVE_PANGO14, 1, [Define if we have Pango 1.4 or newer.]),:)
- PKG_CHECK_MODULES(WEBKIT, [webkit-1.0 >= 1.1.1], , [
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([
-You must have WebKit 1.1.1 or newer development headers installed to compile
-Pidgin. If you want to build only Finch then specify --disable-gtkui when
-running configure.
+ WEBKIT_VERSION=1.1.1
+ if test "x$with_gtk" = "x3"; then
+ PKG_CHECK_MODULES(WEBKIT, [webkitgtk-3.0 >= $WEBKIT_VERSION], , [
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([
+You must have WebKit for GTK+3 $WEBKIT_VERSION or newer development headers
+installed to compile Pidgin. If you want to build only Finch then specify
+--disable-gtkui when running configure.
])])
+ else
+ PKG_CHECK_MODULES(WEBKIT, [webkit-1.0 >= $WEBKIT_VERSION], , [
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([
+You must have WebKit for GTK+2 $WEBKIT_VERSION or newer development headers
+installed to compile Pidgin. If you want to build only Finch then specify
+--disable-gtkui when running configure.
+])])
+ fi
AC_SUBST(WEBKIT_CFLAGS)
AC_SUBST(WEBKIT_LIBS)
@@ -565,6 +599,10 @@ Use --disable-sm if you do not need sess
dnl #######################################################################
dnl # Check for GtkSpell
dnl #######################################################################
+ dnl GtkSpell is not GTK+3 compatible yet
+ if test "x$with_gtk" = "x3"; then
+ enable_gtkspell="no"
+ fi
if test "x$enable_gtkspell" = "xyes" ; then
PKG_CHECK_MODULES(GTKSPELL, gtkspell-2.0 >= 2.0.2, , [
AC_MSG_RESULT(no)
@@ -629,16 +667,29 @@ Use --disable-cap if you do not need the
dnl # Check for GCR for its certificate widgets
dnl #######################################################################
if test "x$enable_gcr" = "xyes"; then
- PKG_CHECK_MODULES(GCR, gcr-0, [
- AC_DEFINE(ENABLE_GCR, 1, [Define to 1 if GCR is found.])], [
- AC_MSG_RESULT(no)
- enable_gcr="no"
- if test "x$force_deps" = "xyes" ; then
- AC_MSG_ERROR([
-GCR development headers not found.
+ if test "x$with_gtk" = "x3"; then
+ PKG_CHECK_MODULES(GCR, gcr-3, [
+ AC_DEFINE(ENABLE_GCR, 1, [Define to 1 if GCR is found.])], [
+ AC_MSG_RESULT(no)
+ enable_gcr="no"
+ if test "x$force_deps" = "xyes" ; then
+ AC_MSG_ERROR([
+GCR for GTK+3 development headers not found.
Use --disable-gcr if you do not need GCR certificate widgets.
])
- fi])
+ fi])
+ else
+ PKG_CHECK_MODULES(GCR, gcr-0, [
+ AC_DEFINE(ENABLE_GCR, 1, [Define to 1 if GCR is found.])], [
+ AC_MSG_RESULT(no)
+ enable_gcr="no"
+ if test "x$force_deps" = "xyes" ; then
+ AC_MSG_ERROR([
+GCR for GTK+2 development headers not found.
+Use --disable-gcr if you do not need GCR certificate widgets.
+])
+ fi])
+ fi
fi
@@ -2589,7 +2640,10 @@ echo
echo $PACKAGE $VERSION
echo
-echo Build GTK+ 2.x UI............. : $enable_gtkui
+echo Build GTK+ UI................. : $enable_gtkui
+if test "x$enable_gtkui" = "xyes"; then
+ echo Build for GTK+ version........ : $with_gtk
+fi
echo Build console UI.............. : $enable_consoleui
echo Build for X11................. : $with_x
echo
diff --git a/doc/pidgin.1.in b/doc/pidgin.1.in
--- a/doc/pidgin.1.in
+++ b/doc/pidgin.1.in
@@ -218,9 +218,7 @@ animation, otherwise only the first fram
.TP
.B Notify buddies that you are typing to them
Some protocols allow clients to tell their buddies when they are typing.
-This option enables this feature for protocols that supports it. For XMPP,
-this also enables sending the "User has left the conversation" message
-when ending the conversation.
+This option enables this feature for protocols that supports it.
.TP
.B Default Formatting
diff --git a/finch/gntrequest.c b/finch/gntrequest.c
--- a/finch/gntrequest.c
+++ b/finch/gntrequest.c
@@ -388,10 +388,11 @@ request_fields_cb(GntWidget *button, Pur
purple_notify_close_with_handle(button);
if (!g_object_get_data(G_OBJECT(button), "cancellation-function") &&
- !purple_request_fields_all_required_filled(fields)) {
More information about the Commits
mailing list