/pidgin/main: c680ade13181: Merge
Tomasz Wasilczyk
twasilczyk at pidgin.im
Wed Feb 12 09:19:50 EST 2014
Changeset: c680ade131813c98a6abd70bb33c06fabb9c2528
Author: Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date: 2014-02-12 15:19 +0100
Branch: default
URL: https://hg.pidgin.im/pidgin/main/rev/c680ade13181
Description:
Merge
diffstat:
doc/Makefile.am | 4 ----
doc/reference/libpurple/Makefile.am | 4 ++++
finch/libgnt/gntprogressbar.h | 1 +
libpurple/Makefile.am | 15 ++++-----------
libpurple/ciphers/aescipher.c | 8 +++++---
libpurple/cmds.h | 1 +
pidgin/Makefile.am | 2 ++
pidgin/gtk3compat.h | 2 ++
pidgin/plugins/unity.c | 11 ++++++-----
9 files changed, 25 insertions(+), 23 deletions(-)
diffs (216 lines):
diff --git a/doc/Makefile.am b/doc/Makefile.am
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -13,14 +13,10 @@ man_MANS += finch.1
endif
EXTRA_DIST = \
- C-HOWTO.dox \
PERL-HOWTO.dox \
TCL-HOWTO.dox \
funniest_home_convos.txt \
finch.1.in \
gtkrc-2.0 \
pidgin.1.in \
- plugin-i18n.dox \
- plugin-ids.dox \
- plugin-signals.dox \
the_penguin.txt
diff --git a/doc/reference/libpurple/Makefile.am b/doc/reference/libpurple/Makefile.am
--- a/doc/reference/libpurple/Makefile.am
+++ b/doc/reference/libpurple/Makefile.am
@@ -84,6 +84,8 @@ HTML_IMAGES=
# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
# e.g. content_files=running.sgml building.sgml changes-2.0.sgml
content_files = version.xml \
+ plugin_i18n.xml \
+ plugin_ids.xml \
signals_account.xml \
signals_blist.xml \
signals_certificate.xml \
@@ -96,9 +98,11 @@ content_files = version.xml \
signals_jabber.xml \
signals_log.xml \
signals_notify.xml \
+ signals_plugin.xml \
signals_savedstatus.xml \
signals_sound.xml \
signals_xfer.xml \
+ tut_c_plugins.xml \
tut_signals.xml \
ui_ops.xml
diff --git a/finch/libgnt/gntprogressbar.h b/finch/libgnt/gntprogressbar.h
--- a/finch/libgnt/gntprogressbar.h
+++ b/finch/libgnt/gntprogressbar.h
@@ -77,6 +77,7 @@ gnt_progress_bar_get_type (void);
* gnt_progress_bar_new:
*
* Create a new GntProgressBar
+ *
* Returns: The new GntProgressBar
*/
GntWidget *
diff --git a/libpurple/Makefile.am b/libpurple/Makefile.am
--- a/libpurple/Makefile.am
+++ b/libpurple/Makefile.am
@@ -2,6 +2,8 @@ EXTRA_DIST = \
dbus-analyze-functions.py \
dbus-analyze-signals.py \
dbus-analyze-types.py \
+ enums.c.in \
+ enums.h.in \
glibcompat.h \
marshallers.list \
purple-notifications-example \
@@ -36,15 +38,6 @@ pkgconfig_DATA = purple-3.pc
SUBDIRS = $(GCONF_DIR) plugins protocols . tests example
-if USE_NSS
-AES_SOURCE = ciphers/aescipher.c
-AES_HEADER = aescipher.h
-endif
-if USE_GNUTLS
-AES_SOURCE = ciphers/aescipher.c
-AES_HEADER = aescipher.h
-endif
-
purple_coresources = \
account.c \
accounts.c \
@@ -54,7 +47,7 @@ purple_coresources = \
buddylist.c \
buddyicon.c \
certificate.c \
- $(AES_SOURCE) \
+ ciphers/aescipher.c \
ciphers/descipher.c \
ciphers/des3cipher.c \
ciphers/hmaccipher.c \
@@ -206,7 +199,7 @@ purple_mediaheaders = \
enum-types.h
purple_cipherheaders = \
- $(AES_HEADER) \
+ aescipher.h \
descipher.h \
des3cipher.h \
hmaccipher.h \
diff --git a/libpurple/ciphers/aescipher.c b/libpurple/ciphers/aescipher.c
--- a/libpurple/ciphers/aescipher.c
+++ b/libpurple/ciphers/aescipher.c
@@ -41,7 +41,7 @@
# include <pk11pub.h>
# include <prerror.h>
#else
-# error "No GnuTLS or NSS support"
+# warning "No GnuTLS or NSS support"
#endif
/* 128bit */
@@ -438,7 +438,8 @@ purple_aes_cipher_encrypt(PurpleCipher *
#elif defined(PURPLE_AES_USE_NSS)
encrypt_func = purple_aes_cipher_nss_encrypt;
#else
-# error "No matching encrypt_func"
+ purple_debug_error("cipher-aes", "No matching encrypt_func\n");
+ return -1;
#endif
succ = encrypt_func(input_padded, output, out_len, priv->iv,
@@ -482,7 +483,8 @@ purple_aes_cipher_decrypt(PurpleCipher *
#elif defined(PURPLE_AES_USE_NSS)
decrypt_func = purple_aes_cipher_nss_decrypt;
#else
-# error "No matching encrypt_func"
+ purple_debug_error("cipher-aes", "No matching decrypt_func\n");
+ return -1;
#endif
succ = decrypt_func(input, output, in_len, priv->iv, priv->key,
diff --git a/libpurple/cmds.h b/libpurple/cmds.h
--- a/libpurple/cmds.h
+++ b/libpurple/cmds.h
@@ -256,6 +256,7 @@ GList *purple_cmd_help(PurpleConversatio
* purple_cmds_get_handle:
*
* Get the handle for the commands API
+ *
* Returns: The handle
*/
gpointer purple_cmds_get_handle(void);
diff --git a/pidgin/Makefile.am b/pidgin/Makefile.am
--- a/pidgin/Makefile.am
+++ b/pidgin/Makefile.am
@@ -144,6 +144,8 @@ libpidgin_la_headers = \
pidgin_SOURCES = \
pidgin.c
+noinst_HEADERS= gtkinternal.h
+
libpidginincludedir=$(includedir)/pidgin
libpidgininclude_HEADERS = \
$(libpidgin_la_headers)
diff --git a/pidgin/gtk3compat.h b/pidgin/gtk3compat.h
--- a/pidgin/gtk3compat.h
+++ b/pidgin/gtk3compat.h
@@ -31,6 +31,8 @@
* Also, any public API should not depend on this file.
*/
+#include <gtk/gtk.h>
+
#if !GTK_CHECK_VERSION(3,2,0)
#define GTK_FONT_CHOOSER GTK_FONT_SELECTION_DIALOG
diff --git a/pidgin/plugins/unity.c b/pidgin/plugins/unity.c
--- a/pidgin/plugins/unity.c
+++ b/pidgin/plugins/unity.c
@@ -17,10 +17,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
#include "internal.h"
-#include "version.h"
#include "account.h"
#include "savedstatuses.h"
+#include "version.h"
+#include "gtk3compat.h"
#include "gtkplugin.h"
#include "gtkconv.h"
#include "gtkutils.h"
@@ -431,13 +432,13 @@ get_config_frame(PurplePlugin *plugin)
GtkWidget *ret = NULL, *frame = NULL;
GtkWidget *vbox = NULL, *toggle = NULL;
- ret = gtk_vbox_new(FALSE, 18);
+ ret = gtk_box_new(GTK_ORIENTATION_VERTICAL, 18);
gtk_container_set_border_width(GTK_CONTAINER (ret), 12);
/* Alerts */
frame = pidgin_make_frame(ret, _("Chatroom alerts"));
- vbox = gtk_vbox_new(FALSE, 5);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
gtk_container_add(GTK_CONTAINER(frame), vbox);
toggle = gtk_check_button_new_with_mnemonic(_("Chatroom message alerts _only where someone says your username"));
@@ -450,7 +451,7 @@ get_config_frame(PurplePlugin *plugin)
/* Launcher integration */
frame = pidgin_make_frame(ret, _("Launcher Icon"));
- vbox = gtk_vbox_new(FALSE, 5);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
gtk_container_add(GTK_CONTAINER(frame), vbox);
toggle = gtk_radio_button_new_with_mnemonic(NULL, _("_Disable launcher integration"));
@@ -479,7 +480,7 @@ get_config_frame(PurplePlugin *plugin)
/* Messaging menu integration */
frame = pidgin_make_frame(ret, _("Messaging Menu"));
- vbox = gtk_vbox_new(FALSE, 5);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
gtk_container_add(GTK_CONTAINER(frame), vbox);
toggle = gtk_radio_button_new_with_mnemonic(NULL,
More information about the Commits
mailing list