/pidgin/main: d4378d7dc742: Hentet ny revision
Nicky Thomassen
nicky at aptget.dk
Wed Feb 12 15:42:30 EST 2014
Changeset: d4378d7dc742600624be7ecafe8dc430c76a4b9e
Author: Nicky Thomassen <nicky at aptget.dk>
Date: 2014-02-12 21:08 +0100
Branch: default
URL: https://hg.pidgin.im/pidgin/main/rev/d4378d7dc742
Description:
Hentet ny revision
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 | 86 +++++++++
pidgin/gtkaccount.c | 22 +-
pidgin/gtkblist.c | 20 +-
pidgin/gtkcertmgr.c | 8 +-
pidgin/gtkconv.c | 76 +++++--
pidgin/gtkdebug.c | 2 +-
pidgin/gtkdialogs.c | 2 +-
pidgin/gtklog.c | 8 +-
pidgin/gtkmedia.c | 14 +-
pidgin/gtkmenutray.c | 7 +-
pidgin/gtknotify.c | 3 +-
pidgin/gtkplugin.c | 2 +-
pidgin/gtkpluginpref.c | 8 +-
pidgin/gtkpounce.c | 7 +-
pidgin/gtkprefs.c | 68 +++---
pidgin/gtkrequest.c | 38 ++--
pidgin/gtkroomlist.c | 3 +-
pidgin/gtksavedstatuses.c | 6 +-
pidgin/gtkscrollbook.c | 3 +-
pidgin/gtkstatusbox.c | 12 +-
pidgin/gtkutils.c | 39 ++-
pidgin/gtkwebviewtoolbar.c | 8 +-
pidgin/gtkwhiteboard.c | 237 ++++++++++--------------
pidgin/minidialog.c | 8 +-
pidgin/pidgintooltip.c | 13 +-
pidgin/plugins/contact_priority.c | 13 +-
pidgin/plugins/disco/gtkdisco.c | 3 +-
pidgin/plugins/gestures/gestures.c | 9 +-
pidgin/plugins/gestures/stroke-draw.c | 72 ++++---
pidgin/plugins/gevolution/add_buddy_dialog.c | 10 +-
pidgin/plugins/gevolution/assoc-buddy.c | 10 +-
pidgin/plugins/gevolution/gevolution.c | 3 +-
pidgin/plugins/gevolution/new_person_dialog.c | 16 +-
pidgin/plugins/musicmessaging/musicmessaging.c | 5 +-
pidgin/plugins/notify.c | 11 +-
pidgin/plugins/raw.c | 3 +-
pidgin/plugins/spellchk.c | 11 +-
pidgin/plugins/themeedit-icon.c | 5 +-
pidgin/plugins/themeedit.c | 4 +-
pidgin/plugins/ticker/ticker.c | 3 +-
pidgin/plugins/unity.c | 11 +-
pidgin/plugins/win32/transparency/win2ktrans.c | 7 +-
pidgin/plugins/xmppconsole.c | 28 +-
po/POTFILES.in | 3 +-
51 files changed, 554 insertions(+), 408 deletions(-)
diffs (truncated from 2992 to 300 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
@@ -58,6 +60,90 @@ static inline GtkWidget * gtk_font_choos
#define GDK_IS_QUARTZ_WINDOW(window) TRUE
#endif
+static inline GdkPixbuf *
+gdk_pixbuf_get_from_surface(cairo_surface_t *surface, gint src_x, gint src_y,
+ gint width, gint height)
+{
+ GdkPixmap *pixmap;
+ GdkPixbuf *pixbuf;
+ cairo_t *cr;
+
+ pixmap = gdk_pixmap_new(NULL, width, height, 24);
+
+ cr = gdk_cairo_create(pixmap);
+ cairo_set_source_surface(cr, surface, -src_x, -src_y);
+ cairo_paint(cr);
+ cairo_destroy(cr);
+
+ pixbuf = gdk_pixbuf_get_from_drawable(NULL, pixmap,
+ gdk_drawable_get_colormap(pixmap), 0, 0, 0, 0, width, height);
+
+ g_object_unref(pixmap);
+
+ return pixbuf;
+}
+
+static inline GtkWidget *
+gtk_box_new(GtkOrientation orientation, gint spacing)
+{
+ g_return_val_if_fail(orientation == GTK_ORIENTATION_HORIZONTAL ||
+ orientation == GTK_ORIENTATION_VERTICAL, NULL);
+
+ if (orientation == GTK_ORIENTATION_HORIZONTAL)
+ return gtk_hbox_new(FALSE, spacing);
+ else /* GTK_ORIENTATION_VERTICAL */
+ return gtk_vbox_new(FALSE, spacing);
+}
+
+static inline GtkWidget *
+gtk_separator_new(GtkOrientation orientation)
+{
+ g_return_val_if_fail(orientation == GTK_ORIENTATION_HORIZONTAL ||
+ orientation == GTK_ORIENTATION_VERTICAL, NULL);
+
+ if (orientation == GTK_ORIENTATION_HORIZONTAL)
+ return gtk_hseparator_new();
+ else /* GTK_ORIENTATION_VERTICAL */
+ return gtk_vseparator_new();
+}
+
+static inline GtkWidget *
+gtk_button_box_new(GtkOrientation orientation)
+{
+ g_return_val_if_fail(orientation == GTK_ORIENTATION_HORIZONTAL ||
+ orientation == GTK_ORIENTATION_VERTICAL, NULL);
+
+ if (orientation == GTK_ORIENTATION_HORIZONTAL)
+ return gtk_hbutton_box_new();
+ else /* GTK_ORIENTATION_VERTICAL */
+ return gtk_vbutton_box_new();
+}
+
+static inline GtkWidget *
+gtk_paned_new(GtkOrientation orientation)
+{
+ g_return_val_if_fail(orientation == GTK_ORIENTATION_HORIZONTAL ||
+ orientation == GTK_ORIENTATION_VERTICAL, NULL);
+
+ if (orientation == GTK_ORIENTATION_HORIZONTAL)
+ return gtk_hpaned_new();
+ else /* GTK_ORIENTATION_VERTICAL */
+ return gtk_vpaned_new();
+}
+
+static inline GtkWidget *
+gtk_scale_new_with_range(GtkOrientation orientation, gdouble min, gdouble max,
+ gdouble step)
+{
+ g_return_val_if_fail(orientation == GTK_ORIENTATION_HORIZONTAL ||
+ orientation == GTK_ORIENTATION_VERTICAL, NULL);
+
+ if (orientation == GTK_ORIENTATION_HORIZONTAL)
+ return gtk_hscale_new_with_range(min, max, step);
+ else /* GTK_ORIENTATION_VERTICAL */
+ return gtk_vscale_new_with_range(min, max, step);
+}
+
#if !GTK_CHECK_VERSION(2,24,0)
#define gdk_x11_set_sm_client_id gdk_set_sm_client_id
diff --git a/pidgin/gtkaccount.c b/pidgin/gtkaccount.c
--- a/pidgin/gtkaccount.c
+++ b/pidgin/gtkaccount.c
@@ -619,7 +619,7 @@ add_login_options(AccountPrefsDialog *di
gtk_widget_show(dialog->login_frame);
/* Main vbox */
- vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BOX_SPACE);
gtk_container_add(GTK_CONTAINER(frame), vbox);
gtk_widget_show(vbox);
@@ -807,7 +807,7 @@ add_user_options(AccountPrefsDialog *dia
gtk_widget_show(dialog->user_frame);
/* Main vbox */
- vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BOX_SPACE);
gtk_container_add(GTK_CONTAINER(frame), vbox);
gtk_widget_show(vbox);
@@ -827,7 +827,7 @@ add_user_options(AccountPrefsDialog *dia
gtk_widget_show(dialog->icon_check);
gtk_box_pack_start(GTK_BOX(vbox), dialog->icon_check, FALSE, FALSE, 0);
- dialog->icon_hbox = hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
+ dialog->icon_hbox = hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE);
gtk_widget_set_sensitive(hbox, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->icon_check)));
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show(hbox);
@@ -850,11 +850,11 @@ add_user_options(AccountPrefsDialog *dia
purple_imgstore_unref(dialog->icon_img);
dialog->icon_img = NULL;
- vbox2 = gtk_vbox_new(FALSE, 0);
+ vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_box_pack_start(GTK_BOX(hbox), vbox2, TRUE, TRUE, 0);
gtk_widget_show(vbox2);
- hbox2 = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
+ hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE);
gtk_box_pack_start(GTK_BOX(vbox2), hbox2, FALSE, FALSE, PIDGIN_HIG_BORDER);
gtk_widget_show(hbox2);
More information about the Commits
mailing list