/soc/2013/ankitkv/gobjectification: b8d598da7311: merge changes ...
Ankit Vani
a at nevitus.org
Mon Jun 3 05:57:41 EDT 2013
Changeset: b8d598da731117177c81ae8fa97ee0da82a785f3
Author: Ankit Vani <a at nevitus.org>
Date: 2013-06-03 15:26 +0530
Branch: soc.2013.gobjectification
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/b8d598da7311
Description:
merge changes from default
diffstat:
ChangeLog | 20 +-
HACKING | 2 +-
NEWS | 6 +-
PLUGIN_HOWTO | 2 +-
README | 2 +-
README.hg | 4 +-
README.mingw | 2 +-
autogen.sh | 2 +-
config.h.mingw | 7 +-
doc/PERL-HOWTO.dox | 2 +-
doc/TCL-HOWTO.dox | 2 +-
doc/finch.1.in | 10 +-
doc/pidgin.1.in | 70 +-
doc/plugin-ids.dox | 4 +-
finch/finch.c | 4 +-
libpurple/Makefile.mingw | 37 +-
libpurple/core.h | 4 +-
libpurple/internal.h | 4 +-
libpurple/media/backend-fs2.c | 11 +-
libpurple/mediamanager.c | 2 +-
libpurple/plugins/debug_example.c | 2 +-
libpurple/plugins/fortuneprofile.pl | 2 +-
libpurple/plugins/notify_example.c | 4 +-
libpurple/plugins/perl/common/Makefile.PL.in | 2 +-
libpurple/plugins/perl/common/Purple.pm | 6 +-
libpurple/plugins/perl/scripts/count_down.pl | 2 +-
libpurple/plugins/perl/scripts/gtk_frame_test.pl | 2 +-
libpurple/plugins/perl/scripts/signals-test.pl | 2 +-
libpurple/plugins/tcl/signal-test.tcl | 2 +-
libpurple/plugins/test.pl | 2 +-
libpurple/protocols/bonjour/bonjour.c | 3 +-
libpurple/protocols/jabber/Makefile.mingw | 16 +-
libpurple/protocols/jabber/google/gmail.c | 2 +-
libpurple/protocols/jabber/google/jingleinfo.c | 2 +-
libpurple/protocols/jabber/jabber.h | 12 +-
libpurple/protocols/myspace/README | 2 +-
libpurple/protocols/myspace/myspace.c | 4 +-
libpurple/protocols/oscar/oscar.c | 2 +-
libpurple/protocols/yahoo/util.c | 4 +-
libpurple/win32/global.mak | 22 +
m4macros/purple.m4 | 2 +-
pidgin.apspec.in | 2 +-
pidgin.spec.in | 2 +-
pidgin/Makefile.mingw | 7 +-
pidgin/gtkblist.c | 2 +-
pidgin/gtkdialogs.c | 20 +-
pidgin/gtkmain.c | 4 +-
pidgin/gtkmedia.c | 86 ++-
pidgin/gtkprefs.c | 120 +-
pidgin/gtksound.c | 50 +-
pidgin/plugins/perl/common/Makefile.PL.in | 2 +-
pidgin/plugins/perl/common/Pidgin.pm | 6 +-
pidgin/plugins/pidginrc.c | 2 +-
pidgin/plugins/vvconfig.c | 804 -----------------------
pidgin/win32/nsis/nsis_translations.desktop.in | 6 +-
pidgin/win32/nsis/pidgin-installer.nsi | 6 +-
po/README | 2 +-
po/mai.po | 2 +-
58 files changed, 391 insertions(+), 1026 deletions(-)
diffs (truncated from 2644 to 300 lines):
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -722,7 +722,7 @@ version 2.7.6 (11/21/2010):
* Added extended capabilities support (none implemented).
* Merged the work done on the Google SoC (major rewrite of SLP code)
* Reworked the data transfer architecture.
- (http://developer.pidgin.im/wiki/SlpArchitecture)
+ (https://developer.pidgin.im/wiki/SlpArchitecture)
* Lots of little changes.
* Don't process zero-length DC messages. (#12660)
* Fixed a bunch of memory leaks.
@@ -2123,7 +2123,7 @@ version 2.4.3 (07/01/2008):
* Various memory leak fixes
version 2.4.2 (05/17/2008):
- http://developer.pidgin.im/query?status=closed&milestone=2.4.2
+ https://developer.pidgin.im/query?status=closed&milestone=2.4.2
libpurple:
* In MySpaceIM, messages from spambots are discarded (Justin Williams)
* Strip mIRC formatting codes from quit and part messages.
@@ -2189,7 +2189,7 @@ version 2.4.2 (05/17/2008):
enabled).
version 2.4.1 (03/31/2008):
- http://developer.pidgin.im/query?status=closed&milestone=2.4.1
+ https://developer.pidgin.im/query?status=closed&milestone=2.4.1
libpurple:
* Treat AIM Unicode messages as UTF-16 rather than UCS-2; this
@@ -2225,7 +2225,7 @@ version 2.4.1 (03/31/2008):
on the right to show it.
version 2.4.0 (02/29/2008):
- http://developer.pidgin.im/query?status=closed&milestone=2.4.0
+ https://developer.pidgin.im/query?status=closed&milestone=2.4.0
libpurple:
* Added support for offline messages for AIM accounts (thanks to
@@ -2284,7 +2284,7 @@ version 2.4.0 (02/29/2008):
* Fixed a bug preventing finch working on x86_64
version 2.3.1 (12/7/2007):
- http://developer.pidgin.im/query?status=closed&milestone=2.3.1
+ https://developer.pidgin.im/query?status=closed&milestone=2.3.1
NOTE: Due to the way this release was made, it is possible that
bugs marked as fixed in 2.3.1 will not be fixed until the
next release.
@@ -2305,7 +2305,7 @@ version 2.3.1 (12/7/2007):
* Prevent autoaccept plugin overwriting existing files
version 2.3.0 (11/24/2007):
- http://developer.pidgin.im/query?status=closed&milestone=2.3.0
+ https://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.3.0).
@@ -2378,7 +2378,7 @@ version 2.3.0 (11/24/2007):
* 'yank' operation for the entry boxes. The default binding is ctrl+y.
version 2.2.2 (10/23/2007):
- http://developer.pidgin.im/query?status=closed&milestone=2.2.2
+ https://developer.pidgin.im/query?status=closed&milestone=2.2.2
NOTE: Due to the way this release was made, it is possible that
bugs marked as fixed in 2.2.1 or 2.2.2 will not be fixed
until the next release.
@@ -2390,7 +2390,7 @@ version 2.2.2 (10/23/2007):
how this is done on other platforms.
version 2.2.1 (09/29/2007):
- http://developer.pidgin.im/query?status=closed&milestone=2.2.1
+ https://developer.pidgin.im/query?status=closed&milestone=2.2.1
NOTE: Due to the backporting that happened for the actual
release, it is possible bugs marked as fixed in 2.2.1
will not be fixed until 2.2.2.
@@ -2415,7 +2415,7 @@ version 2.2.1 (09/29/2007):
dialog.
version 2.2.0 (09/13/2007):
- http://developer.pidgin.im/query?status=closed&milestone=2.2.0
+ https://developer.pidgin.im/query?status=closed&milestone=2.2.0
libpurple:
* New protocol plugin: MySpaceIM (Jeff Connelly, Google Summer of
@@ -2793,7 +2793,7 @@ version 2.0.0 (5/3/2007):
Summer of Code)
* Updated Gadu-Gadu protocol support (Bartosz Oler, Google Summer of
Code). This requires the libgadu library. See
- http://pidgin.im/faq.php#libgadu for more information.
+ https://pidgin.im/faq.php#libgadu for more information.
* SIP/SIMPLE support (Thomas Butter, Google Summer of Code)
* Sametime protocol support
Requires the meanwhile library: http://meanwhile.sourceforge.net
diff --git a/HACKING b/HACKING
--- a/HACKING
+++ b/HACKING
@@ -1,2 +1,2 @@
For information on hacking on Pidgin, Finch, or libpurple, see:
- http://developer.pidgin.im
+ https://developer.pidgin.im
diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
-Our development blog is available at: http://planet.pidgin.im
+Our development blog is available at: https://planet.pidgin.im
2.8.0 (06/07/2011):
Paul: I fixed a few things in this release, and committed some
@@ -537,7 +537,7 @@ 2.0.2 (6/14/2007):
2.0.1 (5/24/2007):
Sean: 2.0.1! Three weeks later, as scheduled! It is so nice to have
regular, frequent, releases again! This is a bugfix release; We have
- fixed over 100 issues reported to us at http://developer.pidgin.im.
+ fixed over 100 issues reported to us at https://developer.pidgin.im.
Thanks to everyone for their great work, and look for the next release
in another three weeks!
@@ -669,7 +669,7 @@ 2.0.0beta7 (4/29/2007):
branding and organizational changes that have been going on for
the last few months, so there are likely to be some snags --
please help us out by trying beta 7, searching for any bugs you
- find in the bug tracker at http://developer.pidgin.im/, and
+ find in the bug tracker at https://developer.pidgin.im/, and
documenting them if they are unknown or you can provide new
information. Help us make 2.0.0 final a release to be remembered
(in a good way)! I'd like to give huge thanks to all of the
diff --git a/PLUGIN_HOWTO b/PLUGIN_HOWTO
--- a/PLUGIN_HOWTO
+++ b/PLUGIN_HOWTO
@@ -1,5 +1,5 @@
For information on writing a plugin for Purple, Pidgin or Finch, go
-http://developer.pidgin.im and click on API. From there, see the
+https://developer.pidgin.im and click on API. From there, see the
HOWTOs in the "Related Pages" section.
You can also generate this documentation locally by installing
diff --git a/README b/README
--- a/README
+++ b/README
@@ -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://developer.pidgin.im
+If you come across a bug, please report it at: https://developer.pidgin.im
PLUGINS
=======
diff --git a/README.hg b/README.hg
--- a/README.hg
+++ b/README.hg
@@ -16,7 +16,7 @@ shiniest features -- but it will prevent
development bugs that we already know about but haven't gotten around to fixing.
If you are interested in hacking on Pidgin, Finch, and/or libpurple, please
-check out the information available at: http://developer.pidgin.im
+check out the information available at: https://developer.pidgin.im
By far the best documentation, however, is the documented code. If you have
doxygen, you can run "make docs" in the toplevel directory to generate pretty
@@ -30,4 +30,4 @@ libpurple developers by email at devel at p
in #pidgin. Please do as much homework as you can before contacting us; the
more you know about your question, the faster and more effectively we can help!
-Patches should be posted as Trac tickets at: http://developer.pidgin.im
+Patches should be posted as Trac tickets at: https://developer.pidgin.im
diff --git a/README.mingw b/README.mingw
--- a/README.mingw
+++ b/README.mingw
@@ -3,4 +3,4 @@ How to build Pidgin for Windows using Mi
For the latest build instructions, please refer to:
-http://developer.pidgin.im/wiki/BuildingWinPidgin
+https://developer.pidgin.im/wiki/BuildingWinPidgin
diff --git a/autogen.sh b/autogen.sh
--- a/autogen.sh
+++ b/autogen.sh
@@ -150,7 +150,7 @@ run_or_die ${LIBTOOLIZE} ${LIBTOOLIZE_FL
run_or_die ${GLIB_GETTEXTIZE} ${GLIB_GETTEXTIZE_FLAGS:-"--force --copy"}
run_or_die ${INTLTOOLIZE} ${INTLTOOLIZE_FLAGS:-"-c -f --automake"}
# This call to sed is needed to work around an annoying bug in intltool 0.40.6
-# See http://developer.pidgin.im/ticket/9520 for details
+# See https://developer.pidgin.im/ticket/9520 for details
run_or_die ${SED} -i.bak -e "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" po/Makefile.in.in
run_or_die ${ACLOCAL} ${ACLOCAL_FLAGS:-"-I m4macros"}
run_or_die ${AUTOHEADER} ${AUTOHEADER_FLAGS}
diff --git a/config.h.mingw b/config.h.mingw
--- a/config.h.mingw
+++ b/config.h.mingw
@@ -362,7 +362,12 @@
/* #undef TM_IN_SYS_TIME */
/* Use GStreamer for playing sounds */
-/* #define USE_GSTREAMER 1 */
+/* It's defined in global.mak. */
+/* #undef USE_GSTREAMER */
+
+/* Use voice and video */
+/* It's defined in global.mak. */
+/* #undef USE_VV */
/* Define if we're using GtkSpell */
#define USE_GTKSPELL 1
diff --git a/doc/PERL-HOWTO.dox b/doc/PERL-HOWTO.dox
--- a/doc/PERL-HOWTO.dox
+++ b/doc/PERL-HOWTO.dox
@@ -19,7 +19,7 @@ use Purple;
summary => "Test plugin for the Perl interpreter.",
description => "Your description here",
author => "John H. Kelm <johnhkelm\@gmail.com",
- url => "http://pidgin.im",
+ url => "https://pidgin.im",
load => "plugin_load",
unload => "plugin_unload"
diff --git a/doc/TCL-HOWTO.dox b/doc/TCL-HOWTO.dox
--- a/doc/TCL-HOWTO.dox
+++ b/doc/TCL-HOWTO.dox
@@ -37,7 +37,7 @@ proc plugin_init { } {
"Example plugin registration" \
"Example of how to register a plugin for the Tcl HOWTO" \
"Ethan Blanton <eblanton at cs.purdue.edu>" \
- "http://pidgin.im/" ]
+ "https://pidgin.im/" ]
}
@endcode
diff --git a/doc/finch.1.in b/doc/finch.1.in
--- a/doc/finch.1.in
+++ b/doc/finch.1.in
@@ -566,12 +566,12 @@ for the status window.
.SH FAQ
FAQ for \fBfinch\fR is located at
.br
-\fIhttp://developer.pidgin.im/wiki/Using%20Finch\fR
+\fIhttps://developer.pidgin.im/wiki/Using%20Finch\fR
.SH BUGS
Known bugs are listed at
.br
-\fIhttp://developer.pidgin.im/query?status=new&status=assigned&status=reopened&component=finch+%28gnt%2Fncurses%29&order=priority\fR
+\fIhttps://developer.pidgin.im/query?status=new&status=assigned&status=reopened&component=finch+%28gnt%2Fncurses%29&order=priority\fR
Before sending a bug report, please verify that you have the latest
version of \fBfinch\fR and libpurple. Many bugs (major and minor) are
@@ -581,15 +581,15 @@ been solved.
.SH PATCHES
If you fix a bug in \fBfinch\fR (or otherwise enhance it), please submit a
patch (using \fBmtn diff > my.diff\fR against the latest version from the
-Monotone repository) at \fIhttp://developer.pidgin.im/simpleticket\fR
+Monotone repository) at \fIhttps://developer.pidgin.im/simpleticket\fR
You are also encouraged to drop by at \fB#pidgin\fR on \fIirc.freenode.net\fR
to discuss development.
.SH SEE ALSO
-\fIhttp://pidgin.im/\fR
+\fIhttps://pidgin.im/\fR
.br
-\fIhttp://developer.pidgin.im/\fR
+\fIhttps://developer.pidgin.im/\fR
.br
\fBpurple-remote\fR(1)
.br
diff --git a/doc/pidgin.1.in b/doc/pidgin.1.in
--- a/doc/pidgin.1.in
+++ b/doc/pidgin.1.in
@@ -509,7 +509,7 @@ Smiley...\fR
.SH PLUGINS
Pidgin allows for dynamic loading of plugins to add extra functionality
to Pidgin. See \fIplugins/HOWTO\fR or
-\fIhttp://developer.pidgin.im/wiki/CHowTo\fR for information on writing
+\fIhttps://developer.pidgin.im/wiki/CHowTo\fR for information on writing
plugins.
The plugins dialog can be accessed by selecting \fIPlugins\fR from the
@@ -559,7 +559,7 @@ about this interaction exists.
\fI~/.purple/plugins/\fR: users' local plugins
.SH BUGS
-The bug tracker can be reached by visiting \fIhttp://developer.pidgin.im/query\fR
+The bug tracker can be reached by visiting \fIhttps://developer.pidgin.im/query\fR
Before sending a bug report, please verify that you have the latest
version of Pidgin. Many bugs (major and minor) are fixed
@@ -569,16 +569,16 @@ have been solved.
.SH PATCHES
If you fix a bug in Pidgin (or otherwise enhance it), please submit a
patch (using \fBmtn diff > my.diff\fR against the latest version from the
-Monotone repository) at \fIhttp://developer.pidgin.im/simpleticket\fR
+Monotone repository) at \fIhttps://developer.pidgin.im/simpleticket\fR
You are also encouraged to drop by at \fB#pidgin\fR on \fIirc.freenode.net\fR
to discuss development.
More information about the Commits
mailing list