pidgin: 925a41f3: Make this whitespace a bit more consiste...
qulogic at pidgin.im
qulogic at pidgin.im
Mon Jun 8 00:35:39 EDT 2009
-----------------------------------------------------------------
Revision: 925a41f329f13a62dca98bb71bad77eba8a5d062
Ancestor: 701b502563ce5e032aa60332fcbf9502f97a4e8d
Author: qulogic at pidgin.im
Date: 2009-06-07T22:07:07
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/925a41f329f13a62dca98bb71bad77eba8a5d062
Modified files:
pidgin/plugins/disco/gtkdisco.c
pidgin/plugins/disco/xmppdisco.c
pidgin/plugins/disco/xmppdisco.h
ChangeLog:
Make this whitespace a bit more consistent (I hope).
-------------- next part --------------
============================================================
--- pidgin/plugins/disco/gtkdisco.c 8165b76258d239a43cd3cadc5935e9562018365a
+++ pidgin/plugins/disco/gtkdisco.c a1d567a24ad131019368fda570e93eb0978190ce
@@ -69,7 +69,7 @@ PidginDiscoList *pidgin_disco_list_ref(P
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 dialog_select_account_cb(GOb
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 @@ static void pidgin_disco_create_tree(Pid
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 @@ PidginDiscoDialog *pidgin_disco_dialog_n
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 @@ PidginDiscoDialog *pidgin_disco_dialog_n
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 @@ PidginDiscoDialog *pidgin_disco_dialog_n
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);
============================================================
--- pidgin/plugins/disco/xmppdisco.c eaeef992be60cb39dcbe130931ad268718bfe1a0
+++ pidgin/plugins/disco/xmppdisco.c f21ae1ad342a414e123678644e6e9252088daaa6
@@ -56,8 +56,8 @@ typedef void (*XmppIqCallback)(PurpleCon
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 @@ xmpp_iq_register_callback(PurpleConnecti
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 {
}
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 @@ plugin_load(PurplePlugin *plugin)
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);
============================================================
--- pidgin/plugins/disco/xmppdisco.h fcd8f465d76cda3ee84334749bbd588b4a2fff93
+++ pidgin/plugins/disco/xmppdisco.h 5195bf8c6b421a6d704dca3ad55a7cdaa92dbf96
@@ -40,22 +40,22 @@ typedef enum
*/
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 @@ typedef enum
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
*/
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 {
More information about the Commits
mailing list