pidgin.vv: 5dfb44b9: Get rid of the rest of the extraneous ch...

maiku at soc.pidgin.im maiku at soc.pidgin.im
Mon Mar 23 02:21:32 EDT 2009


-----------------------------------------------------------------
Revision: 5dfb44b90b1f9c4e8159a365b203c6c1d22fd850
Ancestor: 63befdb114f64dd8fe45e589671053089250b0bf
Author: maiku at soc.pidgin.im
Date: 2009-03-23T06:07:16
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/5dfb44b90b1f9c4e8159a365b203c6c1d22fd850

Modified files:
        finch/gntdebug.c libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/gg/gg.c
        libpurple/protocols/jabber/caps.c
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msnp9/msn.c
        libpurple/protocols/novell/novell.c
        libpurple/protocols/oscar/libicq.c
        libpurple/protocols/silc/silc.c
        libpurple/protocols/simple/simple.c libpurple/prpl.c
        libpurple/prpl.h pidgin/gtkconv.c pidgin/gtkdebug.c
        pidgin/gtkimhtmltoolbar.c pidgin/gtkprefs.c
        pidgin/gtkprefs.h pidgin/pidginstock.c

ChangeLog: 

Get rid of the rest of the extraneous changes.

-------------- next part --------------
============================================================
--- finch/gntdebug.c	f25109c6fe8c8ae2972323f72b22a923c334829a
+++ finch/gntdebug.c	3c50d168613dd61ac43ff2e08bff23ad6f440042
@@ -386,13 +386,6 @@ void finch_debug_init()
 #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 */
============================================================
--- libpurple/protocols/bonjour/bonjour.c	a408eba309842c5c82d9c0e8f9eb8a1268734a0b
+++ libpurple/protocols/bonjour/bonjour.c	7b37abc7740495cf71dbaece6d8a81861bb1e7a8
@@ -727,4 +727,3 @@ PURPLE_INIT_PLUGIN(bonjour, init_plugin,
 }
 
 PURPLE_INIT_PLUGIN(bonjour, init_plugin, info);
-
============================================================
--- libpurple/protocols/gg/gg.c	4f47a21124369931bf2b8c060c797d1ddb290ad2
+++ libpurple/protocols/gg/gg.c	943f6f167939c43dff33656bf75a8240cfbd0783
@@ -2377,4 +2377,3 @@ PURPLE_INIT_PLUGIN(gg, init_plugin, info
 PURPLE_INIT_PLUGIN(gg, init_plugin, info);
 
 /* vim: set ts=8 sts=0 sw=8 noet: */
-
============================================================
--- libpurple/protocols/jabber/caps.c	bca3bfd2e56aa2bb2d059850ec41bdbbd2712ba6
+++ libpurple/protocols/jabber/caps.c	659b7a59b80d43d38a590102053b466e3b28e159
@@ -27,7 +27,6 @@
 #include "util.h"
 #include "iq.h"
 
-
 #define JABBER_CAPS_FILENAME "xmpp-caps.xml"
 
 static GHashTable *capstable = NULL; /* JabberCapsKey -> JabberCapsValue */
============================================================
--- libpurple/protocols/jabber/disco.c	1f9d1587de4799423ca96ff96ec1a64ee01c7536
+++ libpurple/protocols/jabber/disco.c	db36bf845d74596b08214cbcae344eaa2cd5f199
@@ -89,7 +89,7 @@ void jabber_disco_info_parse(JabberStrea
 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 @@ void jabber_disco_info_parse(JabberStrea
 
 		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_disco_server_info_result_cb(Jabbe
 			jabber_google_send_jingle_info(js);
 		} else {
 			/* TODO: add external service discovery here... */
-		} 
+		}
 	}
 
 	for (child = xmlnode_get_child(query, "feature"); child;
============================================================
--- libpurple/protocols/jabber/jabber.h	44ec8a3a0282e934e5cabf49db110cf21d39c50c
+++ libpurple/protocols/jabber/jabber.h	47962a04762e50da9d193b9847d8f1dd0611fbd9
@@ -326,4 +326,5 @@ void jabber_init_plugin(PurplePlugin *pl
 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_ */
============================================================
--- libpurple/protocols/msn/msn.c	d81315da0325b0149aecb1b81a87d993804f5a4d
+++ libpurple/protocols/msn/msn.c	9f2ab13b5be8a4b1a3bb5cb75608a24f43a28162
@@ -2689,4 +2689,3 @@ PURPLE_INIT_PLUGIN(msn, init_plugin, inf
 }
 
 PURPLE_INIT_PLUGIN(msn, init_plugin, info);
-
============================================================
--- libpurple/protocols/msnp9/msn.c	3aabfe79af681402e5094f6b1e24dc27cc23ba17
+++ libpurple/protocols/msnp9/msn.c	ea2a971699e843296307573e6f7900bc4dd45396
@@ -2360,4 +2360,3 @@ PURPLE_INIT_PLUGIN(msnp9, init_plugin, i
 }
 
 PURPLE_INIT_PLUGIN(msnp9, init_plugin, info);
-
============================================================
--- libpurple/protocols/novell/novell.c	e26431f0d55f8263b28950f426dee48f680fc19a
+++ libpurple/protocols/novell/novell.c	ea5eeec533303bb66be92b236dcfb80d6b4f5bc5
@@ -3581,4 +3581,3 @@ PURPLE_INIT_PLUGIN(novell, init_plugin, 
 }
 
 PURPLE_INIT_PLUGIN(novell, init_plugin, info);
-
============================================================
--- libpurple/protocols/oscar/libicq.c	9a48809caf894f4948fbf28c179271c11c15076e
+++ libpurple/protocols/oscar/libicq.c	e85c0d573140cb77cd6e94c9c497f10d406ce5b4
@@ -26,6 +26,7 @@
 
 
 #include "oscarcommon.h"
+
 static GHashTable *
 icq_get_account_text_table(PurpleAccount *account)
 {
============================================================
--- libpurple/protocols/silc/silc.c	5d476ccdad4831c7cb131faeb7f8b28949aba1b7
+++ libpurple/protocols/silc/silc.c	0e9c806ba280d60ebfda94d254f83aac9fe89767
@@ -2249,4 +2249,3 @@ PURPLE_INIT_PLUGIN(silc, init_plugin, in
 }
 
 PURPLE_INIT_PLUGIN(silc, init_plugin, info);
-
============================================================
--- libpurple/protocols/simple/simple.c	d4a87182bb9e03504d1f9199272586b89ea222c7
+++ libpurple/protocols/simple/simple.c	79ef06c00c8dd75ca09fd33edfe0badfc5a9a2b2
@@ -2169,4 +2169,3 @@ PURPLE_INIT_PLUGIN(simple, _init_plugin,
 }
 
 PURPLE_INIT_PLUGIN(simple, _init_plugin, info);
-
============================================================
--- libpurple/prpl.c	475c363f03c27a6cd04d1c4dc882ff7887c2c5b5
+++ libpurple/prpl.c	8cbef9c9f08643a4a5656c4e3c03c25698364420
@@ -568,4 +568,3 @@ purple_find_prpl(const char *id)
 
 	return NULL;
 }
-
============================================================
--- libpurple/prpl.h	bf74aeefa1f0e433dfbb82f9baaae89d9805042f
+++ libpurple/prpl.h	fd8eaac0428c051b7f7c7be82ba2aabda4da4554
@@ -73,6 +73,7 @@ typedef struct _PurpleBuddyIconSpec Purp
 #include "status.h"
 #include "whiteboard.h"
 
+
 /** @copydoc PurpleBuddyIconSpec */
 struct _PurpleBuddyIconSpec {
 	/** This is a comma-delimited list of image formats or @c NULL if icons
============================================================
--- pidgin/gtkconv.c	b27ff202a8f9c44025cf0e344577a11aef68aa29
+++ pidgin/gtkconv.c	f8bf071416ebfb3b66002f33218096a1b73b7442
@@ -7014,7 +7014,7 @@ pidgin_conv_update_buddy_icon(PurpleConv
 	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 @@ pidgin_conversations_init(void)
                                 hide_new_pref_cb, NULL);
 
 
+
 	/**********************************************************************
 	 * Register signals
 	 **********************************************************************/
============================================================
--- pidgin/gtkdebug.c	bb9415eee8f9e01fad88cd17678de66c8b182e22
+++ pidgin/gtkdebug.c	2df81bffb9546e38ab42d114edfbd745b9dfebb6
@@ -985,13 +985,6 @@ pidgin_debug_init(void)
 #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())
============================================================
--- pidgin/gtkimhtmltoolbar.c	bff8486b0c2b63aee8c7ce6703c9a2539858542b
+++ pidgin/gtkimhtmltoolbar.c	5cb24f071177b208678b5635b0acad2f821ce10f
@@ -40,8 +40,6 @@
 #include "gtkthemes.h"
 #include "gtkutils.h"
 
-#include "debug.h"
-
 #include <gdk/gdkkeysyms.h>
 
 static GtkHBoxClass *parent_class = NULL;
@@ -451,12 +449,12 @@ static void insert_hr_cb(GtkWidget *widg
 
 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 @@ static void gtk_imhtmltoolbar_init (GtkI
 	GtkWidget *insert_button;
 	GtkWidget *font_button;
 	GtkWidget *smiley_button;
-
 	GtkWidget *font_menu;
 	GtkWidget *insert_menu;
 	GtkWidget *menuitem;
============================================================
--- pidgin/gtkprefs.c	4382bd85a6597bff32c2adc9aefd88c89fc29501
+++ pidgin/gtkprefs.c	442bb5637eaf87b97351e18d1adc7e8f9599e823
@@ -183,10 +183,12 @@ dropdown_set(GObject *w, const char *key
 
 	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 @@ interface_page(void)
 					_("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 @@ interface_page(void)
 					_("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 @@ interface_page(void)
 #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:"),
============================================================
--- pidgin/gtkprefs.h	ae02f5d8ba2709a46fe1ac33b6332fbec2dce5e1
+++ pidgin/gtkprefs.h	06dae34edc2dfc557810f5c2ac1add220a10a363
@@ -29,7 +29,6 @@
 
 #include "prefs.h"
 
-
 /**
  * Initializes all UI-specific preferences.
  */
============================================================
--- pidgin/pidginstock.c	df36fb4d9625674105454b205424dcf90ab5093f
+++ pidgin/pidginstock.c	2859683d3607f9d279488e1ffa9a5ae3edfe9bd8
@@ -282,6 +282,7 @@ find_file(const char *dir, const char *b
 	return ret;
 }
 
+
 /* Altered from do_colorshift in gnome-panel */
 static void
 do_alphashift(GdkPixbuf *dest, GdkPixbuf *src)


More information about the Commits mailing list