Mon, 11 Apr 2005 04:32:26 +0000
[gaim-migrate @ 12465]
" A variety of spacing normalization I've done as I've
navigated the source making other changes. The specific
changes should be uncontroversial. I'm submitting these to
shrink the deltas between my local tree and the CVS
source. If spacing changes are unwelcome as a general
rule, let me know." --rlaager
I said not to do this sort of patch often.
also a spelling fix.
committer: Luke Schierer <lschiere@pidgin.im>
--- a/plugins/ChangeLog.API Mon Apr 11 04:07:50 2005 +0000 +++ b/plugins/ChangeLog.API Mon Apr 11 04:32:26 2005 +0000 @@ -3,7 +3,7 @@ version 2.0.0cvs: * Changed: All the status stuff. Yay! * Changed: gaim_prefs_connect_callback(), added handle parameter - * Added: gaim_prefs_disconnect_by_handle() + * Added: gaim_prefs_disconnect_by_handle() * Removed: gaim_gtk_sound_{get,set}_mute() (replaced by the /gaim/gtk/sound/mute preference) * Changed: gtk_imhtml_toolbar now descends from GtkHBox making it @@ -32,7 +32,7 @@ no longer return a GaimConnection * Added: a password field to GaimConnection, which only persists for the session (when "remember password" is false, account->password is NEVER set) - Use gaim_connection_get_password(GaimConnection *gc) + Use gaim_connection_get_password(GaimConnection *gc) * Removed: serv_login * Removed: serv_close * Removed: serv_finish_login
--- a/src/account.h Mon Apr 11 04:07:50 2005 +0000 +++ b/src/account.h Mon Apr 11 04:32:26 2005 +0000 @@ -50,37 +50,37 @@ struct _GaimAccount { - char *username; /**< The username. */ - char *alias; /**< The current alias. */ - char *password; /**< The account password. */ - char *user_info; /**< User information. */ + char *username; /**< The username. */ + char *alias; /**< The current alias. */ + char *password; /**< The account password. */ + char *user_info; /**< User information. */ - char *buddy_icon; /**< The buddy icon. */ + char *buddy_icon; /**< The buddy icon. */ - gboolean remember_pass; /**< Remember the password. */ + gboolean remember_pass; /**< Remember the password. */ - char *protocol_id; /**< The ID of the protocol. */ + char *protocol_id; /**< The ID of the protocol. */ - GaimConnection *gc; /**< The connection handle. */ + GaimConnection *gc; /**< The connection handle. */ gboolean disconnecting; /**< The account is currently disconnecting */ - GHashTable *settings; /**< Protocol-specific settings. */ - GHashTable *ui_settings; /**< UI-specific settings. */ + GHashTable *settings; /**< Protocol-specific settings. */ + GHashTable *ui_settings; /**< UI-specific settings. */ - GaimProxyInfo *proxy_info; /**< Proxy information. This will be set */ - /* to NULL when the account inherits */ - /* proxy settings from global prefs. */ + GaimProxyInfo *proxy_info; /**< Proxy information. This will be set */ + /* to NULL when the account inherits */ + /* proxy settings from global prefs. */ - GSList *permit; /**< Permit list. */ - GSList *deny; /**< Deny list. */ - int perm_deny; /**< The permit/deny setting. */ + GSList *permit; /**< Permit list. */ + GSList *deny; /**< Deny list. */ + int perm_deny; /**< The permit/deny setting. */ - GList *status_types; /**< Status types. */ + GList *status_types; /**< Status types. */ - GaimPresence *presence; /**< Presence. */ - GaimLog *system_log; /**< The system log */ + GaimPresence *presence; /**< Presence. */ + GaimLog *system_log; /**< The system log */ - void *ui_data; /**< The UI can put data here. */ + void *ui_data; /**< The UI can put data here. */ }; #ifdef __cplusplus
--- a/src/connection.c Mon Apr 11 04:07:50 2005 +0000 +++ b/src/connection.c Mon Apr 11 04:32:26 2005 +0000 @@ -130,7 +130,7 @@ if (regist) { - gaim_debug_info("connection", "Registering. gc = %p\n", gc); + gaim_debug_info("connection", "Registering. gc = %p\n", gc); /* set this so we don't auto-reconnect after registering */ gc->wants_to_die = TRUE;
--- a/src/gtkconv.c Mon Apr 11 04:07:50 2005 +0000 +++ b/src/gtkconv.c Mon Apr 11 04:32:26 2005 +0000 @@ -81,7 +81,7 @@ {0, 57344, 46592, 44800}, /* Red Hilight */ {0, 49408, 26112, 23040}, /* Red Medium */ {0, 34816, 17920, 12544}, /* Red Dark */ - {0, 49408, 14336, 8704}, /* Red Shadow */ + {0, 49408, 14336, 8704}, /* Red Shadow */ {0, 34816, 32512, 41728}, /* Purple Medium */ {0, 25088, 23296, 33024}, /* Purple Dark */ {0, 18688, 16384, 26112}, /* Purple Shadow */ @@ -90,11 +90,11 @@ {0, 57344, 49920, 40448}, /* Face Skin Medium */ {0, 45824, 37120, 26880}, /* Face skin Dark */ {0, 33280, 26112, 18176}, /* Face Skin Shadow */ - {0, 57088, 16896, 7680}, /* Accent Red */ - {0, 39168, 0, 0}, /* Accent Red Dark */ + {0, 57088, 16896, 7680}, /* Accent Red */ + {0, 39168, 0, 0}, /* Accent Red Dark */ {0, 60928, 54784, 32768}, /* Accent Yellow */ {0, 17920, 40960, 17920}, /* Accent Green */ - {0, 9728, 50944, 9728} /* Accent Green Dark */ + {0, 9728, 50944, 9728} /* Accent Green Dark */ }; #define NUM_NICK_COLORS (sizeof(nick_colors) / sizeof(*nick_colors)) @@ -4977,8 +4977,7 @@ g_snprintf(tmp, sizeof(tmp), ngettext("%d person in room", "%d people in room", - num_users), - num_users); + num_users), num_users); gtk_label_set_text(GTK_LABEL(gtkchat->count), tmp); @@ -5133,8 +5132,7 @@ for (l = users; l != NULL; l = l->next) { model = gtk_tree_view_get_model(GTK_TREE_VIEW(gtkchat->list)); - if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(model), - &iter)) + if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(model), &iter)) continue; do { @@ -5248,7 +5246,7 @@ /* this is wrong, this file ought not call g_new on GtkIMHtmlSmiley */ /* Let gtk_imhtml have a gtk_imhtml_smiley_new function, and let - GtkIMHtmlSmiley by opque */ + GtkIMHtmlSmiley by opaque */ smiley = g_new0(GtkIMHtmlSmiley, 1); smiley->file = NULL; smiley->smile = g_strdup(smile);
--- a/src/gtkdialogs.c Mon Apr 11 04:07:50 2005 +0000 +++ b/src/gtkdialogs.c Mon Apr 11 04:32:26 2005 +0000 @@ -515,7 +515,7 @@ "<span weight=\"bold\" size=\"large\" foreground=\"#1f6bad\">Pimpin\' Penguin Style! *Waddle Waddle*</span>"); else if (!strcmp(norm, "flynorange")) gtk_label_set_markup(GTK_LABEL(label), - "<span weight=\"bold\" size=\"large\" foreground=\"blue\">You should be me. I'm so cute!</span>"); + "<span weight=\"bold\" size=\"large\" foreground=\"blue\">You should be me. I'm so cute!</span>"); else if (!strcmp(norm, "ewarmenhoven")) gtk_label_set_markup(GTK_LABEL(label), "<span weight=\"bold\" size=\"large\" foreground=\"orange\">Now that's what I like!</span>"); @@ -530,7 +530,7 @@ "<span weight=\"bold\" size=\"large\" foreground=\"red\">This sunflower seed taste like pizza.</span>"); else if (!strcmp(norm, "markdoliner")) gtk_label_set_markup(GTK_LABEL(label), - "<span weight=\"bold\" size=\"large\" foreground=\"#6364B1\">Hey! I was in that tumbleweed!</span>"); + "<span weight=\"bold\" size=\"large\" foreground=\"#6364B1\">Hey! I was in that tumbleweed!</span>"); else if (!strcmp(norm, "lschiere")) gtk_label_set_markup(GTK_LABEL(label), "<span weight=\"bold\" size=\"large\" foreground=\"gray\">I'm not anything.</span>"); @@ -845,10 +845,10 @@ text = g_strdup_printf( ngettext( "You are about to remove the contact containing %s " - "and %d other buddy from your buddy list. Do you " + "and %d other buddy from your buddy list. Do you " "want to continue?", "You are about to remove the contact containing %s " - "and %d other buddies from your buddy list. Do you " + "and %d other buddies from your buddy list. Do you " "want to continue?", contact->totalsize - 1), buddy->name, contact->totalsize - 1); @@ -911,7 +911,7 @@ g_return_if_fail(group != NULL); - text = g_strdup_printf(_("You are about to remove the group %s and all its members from your buddy list. Do you want to continue?"), + text = g_strdup_printf(_("You are about to remove the group %s and all its members from your buddy list. Do you want to continue?"), group->name); gaim_request_action(group, NULL, _("Remove Group"), text, 0, group, 2, @@ -953,7 +953,7 @@ g_return_if_fail(buddy != NULL); - text = g_strdup_printf(_("You are about to remove %s from your buddy list. Do you want to continue?"), + text = g_strdup_printf(_("You are about to remove %s from your buddy list. Do you want to continue?"), buddy->name); gaim_request_action(buddy, NULL, _("Remove Buddy"), text, 0, buddy, 2,