# HG changeset patch # User Mike Ruprecht # Date 1237788436 0 # Node ID e23a74d7c97c6bdde720e97fb6e2ed3481c263fd # Parent 0dfd05966e090429d0e05c8a66706bb60a418b89 Get rid of the rest of the extraneous changes. diff -r 0dfd05966e09 -r e23a74d7c97c finch/gntdebug.c --- a/finch/gntdebug.c Mon Mar 23 04:47:54 2009 +0000 +++ b/finch/gntdebug.c Mon Mar 23 06:07:16 2009 +0000 @@ -386,13 +386,6 @@ #ifdef USE_GSTREAMER REGISTER_G_LOG_HANDLER("GStreamer"); #endif -#ifdef USE_VV -#ifdef USE_FARSIGHT - REGISTER_G_LOG_HANDLER("farsight"); - REGISTER_G_LOG_HANDLER("farsight-transmitter"); - REGISTER_G_LOG_HANDLER("farsight-rtp"); -#endif -#endif REGISTER_G_LOG_HANDLER("stderr"); g_set_print_handler(print_stderr); /* Redirect the debug messages to stderr */ diff -r 0dfd05966e09 -r e23a74d7c97c libpurple/protocols/bonjour/bonjour.c --- a/libpurple/protocols/bonjour/bonjour.c Mon Mar 23 04:47:54 2009 +0000 +++ b/libpurple/protocols/bonjour/bonjour.c Mon Mar 23 06:07:16 2009 +0000 @@ -727,4 +727,3 @@ } PURPLE_INIT_PLUGIN(bonjour, init_plugin, info); - diff -r 0dfd05966e09 -r e23a74d7c97c libpurple/protocols/gg/gg.c --- a/libpurple/protocols/gg/gg.c Mon Mar 23 04:47:54 2009 +0000 +++ b/libpurple/protocols/gg/gg.c Mon Mar 23 06:07:16 2009 +0000 @@ -2377,4 +2377,3 @@ PURPLE_INIT_PLUGIN(gg, init_plugin, info); /* vim: set ts=8 sts=0 sw=8 noet: */ - diff -r 0dfd05966e09 -r e23a74d7c97c libpurple/protocols/jabber/caps.c --- a/libpurple/protocols/jabber/caps.c Mon Mar 23 04:47:54 2009 +0000 +++ b/libpurple/protocols/jabber/caps.c Mon Mar 23 06:07:16 2009 +0000 @@ -27,7 +27,6 @@ #include "util.h" #include "iq.h" - #define JABBER_CAPS_FILENAME "xmpp-caps.xml" static GHashTable *capstable = NULL; /* JabberCapsKey -> JabberCapsValue */ diff -r 0dfd05966e09 -r e23a74d7c97c libpurple/protocols/jabber/disco.c --- a/libpurple/protocols/jabber/disco.c Mon Mar 23 04:47:54 2009 +0000 +++ b/libpurple/protocols/jabber/disco.c Mon Mar 23 06:07:16 2009 +0000 @@ -89,7 +89,7 @@ void jabber_disco_info_parse(JabberStream *js, xmlnode *packet) { const char *from = xmlnode_get_attrib(packet, "from"); const char *type = xmlnode_get_attrib(packet, "type"); - + if(!from || !type) return; @@ -115,7 +115,7 @@ if(node) xmlnode_set_attrib(query, "node", node); - + if(!node || !strcmp(node, CAPS0115_NODE "#" VERSION)) { identity = xmlnode_new_child(query, "identity"); xmlnode_set_attrib(identity, "category", "client"); @@ -459,7 +459,7 @@ jabber_google_send_jingle_info(js); } else { /* TODO: add external service discovery here... */ - } + } } for (child = xmlnode_get_child(query, "feature"); child; diff -r 0dfd05966e09 -r e23a74d7c97c libpurple/protocols/jabber/jabber.h --- a/libpurple/protocols/jabber/jabber.h Mon Mar 23 04:47:54 2009 +0000 +++ b/libpurple/protocols/jabber/jabber.h Mon Mar 23 06:07:16 2009 +0000 @@ -326,4 +326,5 @@ PurpleMediaCaps jabber_get_media_caps(PurpleConnection *gc, const char *who); void jabber_register_commands(void); void jabber_init_plugin(PurplePlugin *plugin); + #endif /* _PURPLE_JABBER_H_ */ diff -r 0dfd05966e09 -r e23a74d7c97c libpurple/protocols/msn/msn.c --- a/libpurple/protocols/msn/msn.c Mon Mar 23 04:47:54 2009 +0000 +++ b/libpurple/protocols/msn/msn.c Mon Mar 23 06:07:16 2009 +0000 @@ -2689,4 +2689,3 @@ } PURPLE_INIT_PLUGIN(msn, init_plugin, info); - diff -r 0dfd05966e09 -r e23a74d7c97c libpurple/protocols/msnp9/msn.c --- a/libpurple/protocols/msnp9/msn.c Mon Mar 23 04:47:54 2009 +0000 +++ b/libpurple/protocols/msnp9/msn.c Mon Mar 23 06:07:16 2009 +0000 @@ -2360,4 +2360,3 @@ } PURPLE_INIT_PLUGIN(msnp9, init_plugin, info); - diff -r 0dfd05966e09 -r e23a74d7c97c libpurple/protocols/novell/novell.c --- a/libpurple/protocols/novell/novell.c Mon Mar 23 04:47:54 2009 +0000 +++ b/libpurple/protocols/novell/novell.c Mon Mar 23 06:07:16 2009 +0000 @@ -3581,4 +3581,3 @@ } PURPLE_INIT_PLUGIN(novell, init_plugin, info); - diff -r 0dfd05966e09 -r e23a74d7c97c libpurple/protocols/oscar/libicq.c --- a/libpurple/protocols/oscar/libicq.c Mon Mar 23 04:47:54 2009 +0000 +++ b/libpurple/protocols/oscar/libicq.c Mon Mar 23 06:07:16 2009 +0000 @@ -26,6 +26,7 @@ #include "oscarcommon.h" + static GHashTable * icq_get_account_text_table(PurpleAccount *account) { diff -r 0dfd05966e09 -r e23a74d7c97c libpurple/protocols/silc/silc.c --- a/libpurple/protocols/silc/silc.c Mon Mar 23 04:47:54 2009 +0000 +++ b/libpurple/protocols/silc/silc.c Mon Mar 23 06:07:16 2009 +0000 @@ -2249,4 +2249,3 @@ } PURPLE_INIT_PLUGIN(silc, init_plugin, info); - diff -r 0dfd05966e09 -r e23a74d7c97c libpurple/protocols/simple/simple.c --- a/libpurple/protocols/simple/simple.c Mon Mar 23 04:47:54 2009 +0000 +++ b/libpurple/protocols/simple/simple.c Mon Mar 23 06:07:16 2009 +0000 @@ -2169,4 +2169,3 @@ } PURPLE_INIT_PLUGIN(simple, _init_plugin, info); - diff -r 0dfd05966e09 -r e23a74d7c97c libpurple/prpl.c --- a/libpurple/prpl.c Mon Mar 23 04:47:54 2009 +0000 +++ b/libpurple/prpl.c Mon Mar 23 06:07:16 2009 +0000 @@ -568,4 +568,3 @@ return NULL; } - diff -r 0dfd05966e09 -r e23a74d7c97c libpurple/prpl.h --- a/libpurple/prpl.h Mon Mar 23 04:47:54 2009 +0000 +++ b/libpurple/prpl.h Mon Mar 23 06:07:16 2009 +0000 @@ -73,6 +73,7 @@ #include "status.h" #include "whiteboard.h" + /** @copydoc PurpleBuddyIconSpec */ struct _PurpleBuddyIconSpec { /** This is a comma-delimited list of image formats or @c NULL if icons diff -r 0dfd05966e09 -r e23a74d7c97c pidgin/gtkconv.c --- a/pidgin/gtkconv.c Mon Mar 23 04:47:54 2009 +0000 +++ b/pidgin/gtkconv.c Mon Mar 23 06:07:16 2009 +0000 @@ -7014,7 +7014,7 @@ gtk_event_box_set_visible_window(GTK_EVENT_BOX(event), FALSE); #endif gtk_widget_add_events(event, - GDK_POINTER_MOTION_MASK | GDK_LEAVE_NOTIFY_MASK); + GDK_POINTER_MOTION_MASK | GDK_LEAVE_NOTIFY_MASK); g_signal_connect(G_OBJECT(event), "button-press-event", G_CALLBACK(icon_menu), gtkconv); @@ -7855,6 +7855,7 @@ hide_new_pref_cb, NULL); + /********************************************************************** * Register signals **********************************************************************/ diff -r 0dfd05966e09 -r e23a74d7c97c pidgin/gtkdebug.c --- a/pidgin/gtkdebug.c Mon Mar 23 04:47:54 2009 +0000 +++ b/pidgin/gtkdebug.c Mon Mar 23 06:07:16 2009 +0000 @@ -985,13 +985,6 @@ #ifdef USE_GSTREAMER REGISTER_G_LOG_HANDLER("GStreamer"); #endif -#ifdef USE_VV -#ifdef USE_FARSIGHT - REGISTER_G_LOG_HANDLER("farsight"); - REGISTER_G_LOG_HANDLER("farsight-transmitter"); - REGISTER_G_LOG_HANDLER("farsight-rtp"); -#endif -#endif #ifdef _WIN32 if (!purple_debug_is_enabled()) diff -r 0dfd05966e09 -r e23a74d7c97c pidgin/gtkimhtmltoolbar.c --- a/pidgin/gtkimhtmltoolbar.c Mon Mar 23 04:47:54 2009 +0000 +++ b/pidgin/gtkimhtmltoolbar.c Mon Mar 23 06:07:16 2009 +0000 @@ -40,8 +40,6 @@ #include "gtkthemes.h" #include "gtkutils.h" -#include "debug.h" - #include static GtkHBoxClass *parent_class = NULL; @@ -451,12 +449,12 @@ static void insert_hr_cb(GtkWidget *widget, GtkIMHtmlToolbar *toolbar) { - GtkTextIter iter; - GtkTextMark *ins; + GtkTextIter iter; + GtkTextMark *ins; GtkIMHtmlScalable *hr; - ins = gtk_text_buffer_get_insert(gtk_text_view_get_buffer(GTK_TEXT_VIEW(toolbar->imhtml))); - gtk_text_buffer_get_iter_at_mark(gtk_text_view_get_buffer(GTK_TEXT_VIEW(toolbar->imhtml)), &iter, ins); + ins = gtk_text_buffer_get_insert(gtk_text_view_get_buffer(GTK_TEXT_VIEW(toolbar->imhtml))); + gtk_text_buffer_get_iter_at_mark(gtk_text_view_get_buffer(GTK_TEXT_VIEW(toolbar->imhtml)), &iter, ins); hr = gtk_imhtml_hr_new(); gtk_imhtml_hr_add_to(hr, GTK_IMHTML(toolbar->imhtml), &iter); } @@ -1299,7 +1297,6 @@ GtkWidget *insert_button; GtkWidget *font_button; GtkWidget *smiley_button; - GtkWidget *font_menu; GtkWidget *insert_menu; GtkWidget *menuitem; diff -r 0dfd05966e09 -r e23a74d7c97c pidgin/gtkprefs.c --- a/pidgin/gtkprefs.c Mon Mar 23 04:47:54 2009 +0000 +++ b/pidgin/gtkprefs.c Mon Mar 23 06:07:16 2009 +0000 @@ -183,10 +183,12 @@ if (type == PURPLE_PREF_INT) { int_value = GPOINTER_TO_INT(g_object_get_data(w, "value")); + purple_prefs_set_int(key, int_value); } else if (type == PURPLE_PREF_STRING) { str_value = (const char *)g_object_get_data(w, "value"); + purple_prefs_set_string(key, str_value); } else if (type == PURPLE_PREF_BOOLEAN) { @@ -1235,7 +1237,7 @@ _("Never"), "never", NULL); gtk_size_group_add_widget(sg, label); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); vbox = pidgin_make_frame(ret, _("Conversation Window Hiding")); label = pidgin_prefs_dropdown(vbox, _("_Hide new IM conversations:"), @@ -1245,7 +1247,7 @@ _("Always"), "always", NULL); gtk_size_group_add_widget(sg, label); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); /* All the tab options! */ @@ -1280,7 +1282,7 @@ #endif NULL); gtk_size_group_add_widget(sg, label); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); names = pidgin_conv_placement_get_options(); label = pidgin_prefs_dropdown_from_list(vbox2, _("N_ew conversations:"), diff -r 0dfd05966e09 -r e23a74d7c97c pidgin/gtkprefs.h --- a/pidgin/gtkprefs.h Mon Mar 23 04:47:54 2009 +0000 +++ b/pidgin/gtkprefs.h Mon Mar 23 06:07:16 2009 +0000 @@ -29,7 +29,6 @@ #include "prefs.h" - /** * Initializes all UI-specific preferences. */ diff -r 0dfd05966e09 -r e23a74d7c97c pidgin/pidginstock.c --- a/pidgin/pidginstock.c Mon Mar 23 04:47:54 2009 +0000 +++ b/pidgin/pidginstock.c Mon Mar 23 06:07:16 2009 +0000 @@ -282,6 +282,7 @@ return ret; } + /* Altered from do_colorshift in gnome-panel */ static void do_alphashift(GdkPixbuf *dest, GdkPixbuf *src)