# HG changeset patch # User Elliott Sales de Andrade # Date 1244412427 0 # Node ID abab554140b59e9d3baa82ee502ca4e4a7db9714 # Parent c2c6ef44d66e44b64b7e9437bb523f2be0c9e8de Make this whitespace a bit more consistent (I hope). diff -r c2c6ef44d66e -r abab554140b5 pidgin/plugins/disco/gtkdisco.c --- a/pidgin/plugins/disco/gtkdisco.c Sun Jun 07 18:46:23 2009 +0000 +++ b/pidgin/plugins/disco/gtkdisco.c Sun Jun 07 22:07:07 2009 +0000 @@ -69,7 +69,7 @@ g_return_val_if_fail(list != NULL, NULL); ++list->ref; - purple_debug_misc("xmppdisco", "reffing list, ref count now %d\n", list->ref); + purple_debug_misc("xmppdisco", "reffing list, ref count now %d\n", list->ref); return list; } @@ -115,7 +115,7 @@ static void pidgin_disco_create_tree(PidginDiscoList *pdl); static void dialog_select_account_cb(GObject *w, PurpleAccount *account, - PidginDiscoDialog *dialog) + PidginDiscoDialog *dialog) { dialog->account = account; gtk_widget_set_sensitive(dialog->browse_button, account != NULL); @@ -348,7 +348,7 @@ column = gtk_tree_view_column_new(); gtk_tree_view_column_set_title(column, _("Name")); - gtk_tree_view_column_pack_start(column, pixbuf_renderer, FALSE); + gtk_tree_view_column_pack_start(column, pixbuf_renderer, FALSE); gtk_tree_view_column_set_attributes(column, pixbuf_renderer, "pixbuf", PIXBUF_COLUMN, NULL); @@ -464,13 +464,15 @@ gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); /* stop button */ - dialog->stop_button = pidgin_dialog_add_button(GTK_DIALOG(window), GTK_STOCK_STOP, - G_CALLBACK(stop_button_cb), dialog); + dialog->stop_button = + pidgin_dialog_add_button(GTK_DIALOG(window), GTK_STOCK_STOP, + G_CALLBACK(stop_button_cb), dialog); gtk_widget_set_sensitive(dialog->stop_button, FALSE); /* browse button */ - dialog->browse_button = pidgin_pixbuf_button_from_stock(_("_Browse"), GTK_STOCK_REFRESH, - PIDGIN_BUTTON_HORIZONTAL); + dialog->browse_button = + pidgin_pixbuf_button_from_stock(_("_Browse"), GTK_STOCK_REFRESH, + PIDGIN_BUTTON_HORIZONTAL); gtk_box_pack_start(GTK_BOX(bbox), dialog->browse_button, FALSE, FALSE, 0); g_signal_connect(G_OBJECT(dialog->browse_button), "clicked", G_CALLBACK(browse_button_cb), dialog); @@ -478,13 +480,15 @@ gtk_widget_show(dialog->browse_button); /* register button */ - dialog->register_button = pidgin_dialog_add_button(GTK_DIALOG(dialog->window), _("Register"), - G_CALLBACK(register_button_cb), dialog); + dialog->register_button = + pidgin_dialog_add_button(GTK_DIALOG(dialog->window), _("Register"), + G_CALLBACK(register_button_cb), dialog); gtk_widget_set_sensitive(dialog->register_button, FALSE); /* add button */ - dialog->add_button = pidgin_pixbuf_button_from_stock(_("_Add"), GTK_STOCK_ADD, - PIDGIN_BUTTON_HORIZONTAL); + dialog->add_button = + pidgin_pixbuf_button_from_stock(_("_Add"), GTK_STOCK_ADD, + PIDGIN_BUTTON_HORIZONTAL); gtk_box_pack_start(GTK_BOX(bbox), dialog->add_button, FALSE, FALSE, 0); g_signal_connect(G_OBJECT(dialog->add_button), "clicked", G_CALLBACK(add_room_to_blist_cb), dialog); @@ -492,8 +496,9 @@ gtk_widget_show(dialog->add_button); /* close button */ - dialog->close_button = pidgin_dialog_add_button(GTK_DIALOG(window), GTK_STOCK_CLOSE, - G_CALLBACK(close_button_cb), dialog); + dialog->close_button = + pidgin_dialog_add_button(GTK_DIALOG(window), GTK_STOCK_CLOSE, + G_CALLBACK(close_button_cb), dialog); /* show the dialog window and return the dialog */ gtk_widget_show(dialog->window); diff -r c2c6ef44d66e -r abab554140b5 pidgin/plugins/disco/xmppdisco.c --- a/pidgin/plugins/disco/xmppdisco.c Sun Jun 07 18:46:23 2009 +0000 +++ b/pidgin/plugins/disco/xmppdisco.c Sun Jun 07 22:07:07 2009 +0000 @@ -56,8 +56,8 @@ static gboolean iq_listening = FALSE; typedef void (*XmppIqCallback)(PurpleConnection *pc, const char *type, - const char *id, const char *from, xmlnode *iq, - gpointer data); + const char *id, const char *from, xmlnode *iq, + gpointer data); struct xmpp_iq_cb_data { @@ -149,7 +149,7 @@ g_hash_table_insert(iq_callbacks, id, cbdata); if (!iq_listening) { - PurplePlugin *prpl = purple_plugins_find_with_id(XMPP_PLUGIN_ID); + PurplePlugin *prpl = purple_plugins_find_with_id(XMPP_PLUGIN_ID); iq_listening = TRUE; purple_signal_connect(prpl, "jabber-receiving-iq", my_plugin, PURPLE_CALLBACK(xmpp_iq_received), NULL); @@ -245,30 +245,30 @@ } static const struct { - const char *from; - const char *to; + const char *from; + const char *to; } disco_type_mappings[] = { - { "gadu-gadu", "gadu-gadu" }, /* the prpl is prpl-gg, but list_icon returns "gadu-gadu" */ - { "sametime", "meanwhile" }, - { "myspaceim", "myspace" }, - { "xmpp", "jabber" }, /* prpl-jabber (mentioned in case the prpl is renamed so this line will match) */ - { NULL, NULL } + { "gadu-gadu", "gadu-gadu" }, /* the prpl is prpl-gg, but list_icon returns "gadu-gadu" */ + { "sametime", "meanwhile" }, + { "myspaceim", "myspace" }, + { "xmpp", "jabber" }, /* prpl-jabber (mentioned in case the prpl is renamed so this line will match) */ + { NULL, NULL } }; static const gchar * disco_type_from_string(const gchar *str) { - int i = 0; + int i = 0; - g_return_val_if_fail(str != NULL, ""); + g_return_val_if_fail(str != NULL, ""); - for ( ; disco_type_mappings[i].from; ++i) { - if (!strcasecmp(str, disco_type_mappings[i].from)) - return disco_type_mappings[i].to; - } + for ( ; disco_type_mappings[i].from; ++i) { + if (!strcasecmp(str, disco_type_mappings[i].from)) + return disco_type_mappings[i].to; + } - /* fallback to the string itself */ - return str; + /* fallback to the string itself */ + return str; } static void @@ -607,13 +607,13 @@ static gboolean plugin_load(PurplePlugin *plugin) { - PurplePlugin *xmpp_prpl; + PurplePlugin *xmpp_prpl; my_plugin = plugin; - xmpp_prpl = purple_plugins_find_with_id(XMPP_PLUGIN_ID); - if (NULL == xmpp_prpl) - return FALSE; + xmpp_prpl = purple_plugins_find_with_id(XMPP_PLUGIN_ID); + if (NULL == xmpp_prpl) + return FALSE; purple_signal_connect(purple_connections_get_handle(), "signing-off", plugin, PURPLE_CALLBACK(signed_off_cb), NULL); diff -r c2c6ef44d66e -r abab554140b5 pidgin/plugins/disco/xmppdisco.h --- a/pidgin/plugins/disco/xmppdisco.h Sun Jun 07 18:46:23 2009 +0000 +++ b/pidgin/plugins/disco/xmppdisco.h Sun Jun 07 22:07:07 2009 +0000 @@ -40,22 +40,22 @@ */ typedef enum { - XMPP_DISCO_SERVICE_TYPE_UNSET, - /** - * A registerable gateway to another protocol. An example would be - * XMPP legacy transports. - */ - XMPP_DISCO_SERVICE_TYPE_GATEWAY, + XMPP_DISCO_SERVICE_TYPE_UNSET, + /** + * A registerable gateway to another protocol. An example would be + * XMPP legacy transports. + */ + XMPP_DISCO_SERVICE_TYPE_GATEWAY, - /** - * A directory (e.g. allows the user to search for other users). - */ - XMPP_DISCO_SERVICE_TYPE_DIRECTORY, + /** + * A directory (e.g. allows the user to search for other users). + */ + XMPP_DISCO_SERVICE_TYPE_DIRECTORY, - /** - * A chat (multi-user conversation). - */ - XMPP_DISCO_SERVICE_TYPE_CHAT, + /** + * A chat (multi-user conversation). + */ + XMPP_DISCO_SERVICE_TYPE_CHAT, /** * A pubsub collection (contains nodes) @@ -68,9 +68,9 @@ XMPP_DISCO_SERVICE_TYPE_PUBSUB_LEAF, /** - * Something else. Do we need more categories? - */ - XMPP_DISCO_SERVICE_TYPE_OTHER + * Something else. Do we need more categories? + */ + XMPP_DISCO_SERVICE_TYPE_OTHER } XmppDiscoServiceType; /** @@ -78,10 +78,10 @@ */ typedef enum { - XMPP_DISCO_NONE = 0x0000, - XMPP_DISCO_ADD = 0x0001, /**< Supports an 'add' operation */ - XMPP_DISCO_BROWSE = 0x0002, /**< Supports browsing */ - XMPP_DISCO_REGISTER = 0x0004 /**< Supports a 'register' operation */ + XMPP_DISCO_NONE = 0x0000, + XMPP_DISCO_ADD = 0x0001, /**< Supports an 'add' operation */ + XMPP_DISCO_BROWSE = 0x0002, /**< Supports browsing */ + XMPP_DISCO_REGISTER = 0x0004 /**< Supports a 'register' operation */ } XmppDiscoServiceFlags; struct _XmppDiscoService {