# HG changeset patch # User Richard Laager # Date 1294124130 0 # Node ID a8cc50c2279fb8410a4785dfef5b2becd1aee658 # Parent 44f53d3fc54f8fc5c0c160341f28a1308232feb6 Remove trailing whitespace diff -r 44f53d3fc54f -r a8cc50c2279f finch/finch.c --- a/finch/finch.c Tue Jan 04 06:42:45 2011 +0000 +++ b/finch/finch.c Tue Jan 04 06:55:30 2011 +0000 @@ -422,7 +422,7 @@ /* Initialize the libpurple stuff */ if (!init_libpurple(*argc, *argv)) return FALSE; - + purple_blist_show(); return TRUE; } diff -r 44f53d3fc54f -r a8cc50c2279f finch/getopt.c --- a/finch/getopt.c Tue Jan 04 06:42:45 2011 +0000 +++ b/finch/getopt.c Tue Jan 04 06:55:30 2011 +0000 @@ -178,7 +178,7 @@ { REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER } ordering; - + #ifdef __GNU_LIBRARY__ /* We want to avoid inclusion of string.h with non-GNU libraries because there are many ways it can cause trouble. @@ -219,7 +219,7 @@ to[i] = from[i]; } #endif /* GNU C library. */ - + /* Handle permutation of arguments. */ /* Describe the part of ARGV that contains non-options that have @@ -259,7 +259,7 @@ first_nonopt += (optind - last_nonopt); last_nonopt = optind; } - + /* Scan elements of ARGV (whose length is ARGC) for option characters given in OPTSTRING. @@ -663,7 +663,7 @@ } #endif /* _LIBC or not __GNU_LIBRARY__. */ - + #ifdef TEST /* Compile with -DTEST to make an executable for use in testing diff -r 44f53d3fc54f -r a8cc50c2279f finch/getopt1.c --- a/finch/getopt1.c Tue Jan 04 06:42:45 2011 +0000 +++ b/finch/getopt1.c Tue Jan 04 06:55:30 2011 +0000 @@ -81,7 +81,7 @@ #endif /* _LIBC or not __GNU_LIBRARY__. */ - + #ifdef TEST #include diff -r 44f53d3fc54f -r a8cc50c2279f finch/gntaccount.c --- a/finch/gntaccount.c Tue Jan 04 06:42:45 2011 +0000 +++ b/finch/gntaccount.c Tue Jan 04 06:55:30 2011 +0000 @@ -308,7 +308,7 @@ if (!plugin) return; prplinfo = PURPLE_PLUGIN_PROTOCOL_INFO(plugin); - + username = dialog->account ? g_strdup(purple_account_get_username(dialog->account)) : NULL; for (iter = prplinfo->user_splits; iter; iter = iter->next) diff -r 44f53d3fc54f -r a8cc50c2279f finch/gntblist.c --- a/finch/gntblist.c Tue Jan 04 06:42:45 2011 +0000 +++ b/finch/gntblist.c Tue Jan 04 06:55:30 2011 +0000 @@ -1807,7 +1807,7 @@ } } } - + tmp = purple_notify_user_info_get_text_with_newline(user_info, "
"); purple_notify_user_info_destroy(user_info); @@ -2066,7 +2066,7 @@ gnt_tree_set_compare_func(GNT_TREE(ggblist->tree), (GCompareFunc)blist_node_compare_log); } - + list = purple_get_blist(); node = purple_blist_get_root(); while (node) diff -r 44f53d3fc54f -r a8cc50c2279f finch/gntcertmgr.c --- a/finch/gntcertmgr.c Tue Jan 04 06:42:45 2011 +0000 +++ b/finch/gntcertmgr.c Tue Jan 04 06:55:30 2011 +0000 @@ -193,7 +193,7 @@ subject = purple_certificate_get_subject_name(crt); secondary = g_strdup_printf(_("Common name: %s\n\nSHA1 fingerprint:\n%s"), subject, fpr_sha1_asc); - + purple_notify_info(NULL, _("SSL Host Certificate"), primary, secondary); diff -r 44f53d3fc54f -r a8cc50c2279f finch/gntconn.c --- a/finch/gntconn.c Tue Jan 04 06:42:45 2011 +0000 +++ b/finch/gntconn.c Tue Jan 04 06:55:30 2011 +0000 @@ -159,7 +159,7 @@ return &handle; } -static PurpleConnectionUiOps ops = +static PurpleConnectionUiOps ops = { NULL, /* connect_progress */ NULL, /* connected */ diff -r 44f53d3fc54f -r a8cc50c2279f finch/gntconv.c --- a/finch/gntconv.c Tue Jan 04 06:42:45 2011 +0000 +++ b/finch/gntconv.c Tue Jan 04 06:55:30 2011 +0000 @@ -1155,7 +1155,7 @@ return FALSE; } -static PurpleConversationUiOps conv_ui_ops = +static PurpleConversationUiOps conv_ui_ops = { finch_create_conversation, finch_destroy_conversation, diff -r 44f53d3fc54f -r a8cc50c2279f finch/gntft.c --- a/finch/gntft.c Tue Jan 04 06:42:45 2011 +0000 +++ b/finch/gntft.c Tue Jan 04 06:55:30 2011 +0000 @@ -356,7 +356,7 @@ if (xfer_dialog->num_transfers == 0 && !xfer_dialog->keep_open) finch_xfer_dialog_destroy(); - else + else update_title_progress(); purple_xfer_unref(xfer); } diff -r 44f53d3fc54f -r a8cc50c2279f finch/gntmedia.c --- a/finch/gntmedia.c Tue Jan 04 06:42:45 2011 +0000 +++ b/finch/gntmedia.c Tue Jan 04 06:55:30 2011 +0000 @@ -252,7 +252,7 @@ } else if (state == PURPLE_MEDIA_STATE_CONNECTED) { finch_media_connected_cb(media, gntmedia); } else if (state == PURPLE_MEDIA_STATE_NEW && - sid != NULL && name != NULL && + sid != NULL && name != NULL && purple_media_is_initiator(media, sid, name) == FALSE) { PurpleAccount *account; PurpleBuddy *buddy; @@ -360,7 +360,7 @@ g_value_set_object(value, media->priv->media); break; default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; } } @@ -480,7 +480,7 @@ PURPLE_CMD_FLAG_IM, NULL, call_cmd_cb, _("call: Make an audio call."), NULL); - purple_media_manager_set_ui_caps(manager, + purple_media_manager_set_ui_caps(manager, PURPLE_MEDIA_CAPS_AUDIO | PURPLE_MEDIA_CAPS_AUDIO_SINGLE_DIRECTION); diff -r 44f53d3fc54f -r a8cc50c2279f finch/gntnotify.c --- a/finch/gntnotify.c Tue Jan 04 06:42:45 2011 +0000 +++ b/finch/gntnotify.c Tue Jan 04 06:55:30 2011 +0000 @@ -130,7 +130,7 @@ while (widget->parent) widget = widget->parent; - + if (type == PURPLE_NOTIFY_SEARCHRESULTS) purple_notify_searchresults_free(g_object_get_data(handle, "notify-results")); #if 1 @@ -489,7 +489,7 @@ return finch_notify_message(PURPLE_NOTIFY_URI, _("URI"), url, NULL); } -static PurpleNotifyUiOps ops = +static PurpleNotifyUiOps ops = { finch_notify_message, finch_notify_email, diff -r 44f53d3fc54f -r a8cc50c2279f finch/gntplugin.c --- a/finch/gntplugin.c Tue Jan 04 06:42:45 2011 +0000 +++ b/finch/gntplugin.c Tue Jan 04 06:55:30 2011 +0000 @@ -64,7 +64,7 @@ static void decide_conf_button(PurplePlugin *plugin) { - if (purple_plugin_is_loaded(plugin) && + if (purple_plugin_is_loaded(plugin) && ((PURPLE_IS_GNT_PLUGIN(plugin) && FINCH_PLUGIN_UI_INFO(plugin) != NULL) || (plugin->info->prefs_info && @@ -262,7 +262,7 @@ PurplePlugin *plugin; g_return_if_fail(plugins.window); - + plugin = purple_plugin_probe(filename); if (!plugin) { purple_notify_error(handle, _("Error loading plugin"), diff -r 44f53d3fc54f -r a8cc50c2279f finch/gntprefs.c --- a/finch/gntprefs.c Tue Jan 04 06:42:45 2011 +0000 +++ b/finch/gntprefs.c Tue Jan 04 06:55:30 2011 +0000 @@ -180,21 +180,21 @@ return field; } -static Prefs blist[] = +static Prefs blist[] = { {PURPLE_PREF_BOOLEAN, "/finch/blist/idletime", N_("Show Idle Time"), NULL}, {PURPLE_PREF_BOOLEAN, "/finch/blist/showoffline", N_("Show Offline Buddies"), NULL}, {PURPLE_PREF_NONE, NULL, NULL, NULL} }; -static Prefs convs[] = +static Prefs convs[] = { {PURPLE_PREF_BOOLEAN, "/finch/conversations/timestamps", N_("Show Timestamps"), NULL}, {PURPLE_PREF_BOOLEAN, "/finch/conversations/notify_typing", N_("Notify buddies when you are typing"), NULL}, {PURPLE_PREF_NONE, NULL, NULL, NULL} }; -static Prefs logging[] = +static Prefs logging[] = { {PURPLE_PREF_STRING, "/purple/logging/format", N_("Log format"), get_log_options}, {PURPLE_PREF_BOOLEAN, "/purple/logging/log_ims", N_("Log IMs"), NULL}, diff -r 44f53d3fc54f -r a8cc50c2279f finch/gntrequest.c --- a/finch/gntrequest.c Tue Jan 04 06:42:45 2011 +0000 +++ b/finch/gntrequest.c Tue Jan 04 06:55:30 2011 +0000 @@ -243,7 +243,7 @@ setup_default_callback(window, cancel_cb, user_data); gnt_widget_show(window); - + return window; } diff -r 44f53d3fc54f -r a8cc50c2279f finch/gntsound.c --- a/finch/gntsound.c Tue Jan 04 06:42:45 2011 +0000 +++ b/finch/gntsound.c Tue Jan 04 06:55:30 2011 +0000 @@ -554,11 +554,11 @@ } play = gst_element_factory_make("playbin", "play"); - + if (play == NULL) { return; } - + uri = g_strdup_printf("file://%s", filename); g_object_set(G_OBJECT(play), "uri", uri, @@ -688,7 +688,7 @@ gnt_tree_change_text(GNT_TREE(pref_dialog->events), GINT_TO_POINTER(event->id), 1, file); gnt_tree_set_choice(GNT_TREE(pref_dialog->events), GINT_TO_POINTER(event->id), TRUE); - + gnt_widget_destroy(GNT_WIDGET(w)); } @@ -731,7 +731,7 @@ reset_cb(GntWidget *button, gpointer null) { /* Don't dereference this pointer ! */ - gpointer key = gnt_tree_get_selection_data(GNT_TREE(pref_dialog->events)); + gpointer key = gnt_tree_get_selection_data(GNT_TREE(pref_dialog->events)); FinchSoundEvent * event = &sounds[GPOINTER_TO_INT(key)]; g_free(event->file); @@ -881,7 +881,7 @@ gnt_entry_set_text(entry, ""); gnt_tree_set_selected(GNT_TREE(pref_dialog->profiles), key); finch_sound_set_active_profile(key); - } else + } else reload_pref_window(profile); } @@ -982,13 +982,13 @@ gnt_combo_box_add_data(GNT_COMBO_BOX(cmbox), "nosound", _("No Sound")); label = gnt_label_new_with_format(_("Sound Method"), GNT_TEXT_FLAG_BOLD); - gnt_box_add_widget(GNT_BOX(box), label); + gnt_box_add_widget(GNT_BOX(box), label); tmpbox = gnt_hbox_new(TRUE); gnt_box_set_fill(GNT_BOX(tmpbox), FALSE); gnt_box_set_pad(GNT_BOX(tmpbox), 0); gnt_box_add_widget(GNT_BOX(tmpbox), gnt_label_new(_("Method: "))); gnt_box_add_widget(GNT_BOX(tmpbox), cmbox); - gnt_box_add_widget(GNT_BOX(box), tmpbox); + gnt_box_add_widget(GNT_BOX(box), tmpbox); tmpbox = gnt_hbox_new(TRUE); gnt_box_set_pad(GNT_BOX(tmpbox), 0); @@ -1001,7 +1001,7 @@ gnt_box_add_widget(GNT_BOX(box), gnt_line_new(FALSE)); /* Sound options */ - gnt_box_add_widget(GNT_BOX(box), gnt_label_new_with_format(_("Sound Options"), GNT_TEXT_FLAG_BOLD)); + gnt_box_add_widget(GNT_BOX(box), gnt_label_new_with_format(_("Sound Options"), GNT_TEXT_FLAG_BOLD)); pref_dialog->conv_focus = chkbox = gnt_check_box_new(_("Sounds when conversation has focus")); gnt_box_add_widget(GNT_BOX(box), chkbox); @@ -1038,7 +1038,7 @@ gnt_box_add_widget(GNT_BOX(win), gnt_hline_new()); /* Sound events */ - gnt_box_add_widget(GNT_BOX(win), gnt_label_new_with_format(_("Sound Events"), GNT_TEXT_FLAG_BOLD)); + gnt_box_add_widget(GNT_BOX(win), gnt_label_new_with_format(_("Sound Events"), GNT_TEXT_FLAG_BOLD)); pref_dialog->events = tree = gnt_tree_new_with_columns(2); gnt_tree_set_column_titles(GNT_TREE(tree), _("Event"), _("File")); gnt_tree_set_show_title(GNT_TREE(tree), TRUE); diff -r 44f53d3fc54f -r a8cc50c2279f finch/gntstatus.c --- a/finch/gntstatus.c Tue Jan 04 06:42:45 2011 +0000 +++ b/finch/gntstatus.c Tue Jan 04 06:55:30 2011 +0000 @@ -314,7 +314,7 @@ gnt_box_give_focus_to_child(GNT_BOX(edit->window), edit->title); return; } - + if (edit->saved == NULL) { edit->saved = purple_savedstatus_new(title, prim); @@ -409,7 +409,7 @@ gnt_tree_change_text(GNT_TREE(sub->parent->tree), row, 1, purple_status_type_get_name(type)); gnt_tree_change_text(GNT_TREE(sub->parent->tree), row, 2, message); - + gnt_widget_destroy(sub->window); } diff -r 44f53d3fc54f -r a8cc50c2279f finch/gntui.c --- a/finch/gntui.c Tue Jan 04 06:42:45 2011 +0000 +++ b/finch/gntui.c Tue Jan 04 06:55:30 2011 +0000 @@ -51,7 +51,7 @@ #endif purple_prefs_add_none("/purple/gnt"); - + /* Accounts */ finch_accounts_init(); purple_accounts_set_ui_ops(finch_accounts_get_ui_ops()); diff -r 44f53d3fc54f -r a8cc50c2279f finch/libgnt/gntbindable.c --- a/finch/libgnt/gntbindable.c Tue Jan 04 06:42:45 2011 +0000 +++ b/finch/libgnt/gntbindable.c Tue Jan 04 06:55:30 2011 +0000 @@ -48,7 +48,7 @@ GList * params; /* The list of paramaters */ } rebind_info; -static void +static void gnt_bindable_free_rebind_info(void) { g_free(rebind_info.name); @@ -92,7 +92,7 @@ if (!strcmp(text, GNT_KEY_CTRL_I) || !strcmp(text, GNT_KEY_ENTER)) { return FALSE; } - + tmp = gnt_key_lookup(text); new_text = g_strdup_printf("KEY: \"%s\"", tmp); gnt_text_view_clear(textview); @@ -105,7 +105,7 @@ return TRUE; } return FALSE; -} +} static void gnt_bindable_rebinding_activate(GntBindable *data, gpointer bindable) { @@ -154,18 +154,18 @@ g_signal_connect(G_OBJECT(win), "key_pressed", G_CALLBACK(gnt_bindable_rebinding_grab_key), key_textview); button_box = gnt_box_new(FALSE, FALSE); - + bind_button = gnt_button_new("BIND"); gnt_widget_set_name(bind_button, "bind"); gnt_box_add_widget(GNT_BOX(button_box), bind_button); - + cancel_button = gnt_button_new("Cancel"); gnt_widget_set_name(cancel_button, "cancel"); gnt_box_add_widget(GNT_BOX(button_box), cancel_button); - + g_signal_connect(G_OBJECT(bind_button), "activate", G_CALLBACK(gnt_bindable_rebinding_rebind), win); g_signal_connect(G_OBJECT(cancel_button), "activate", G_CALLBACK(gnt_bindable_rebinding_cancel), win); - + gnt_box_add_widget(GNT_BOX(vbox), button_box); gnt_box_add_widget(GNT_BOX(win), vbox); @@ -320,7 +320,7 @@ while ((p = va_arg(args, void *)) != NULL) list = g_list_append(list, p); va_end(args); - + action = g_hash_table_lookup(klass->actions, name); if (action && action->u.action) { return action->u.action(bindable, list); diff -r 44f53d3fc54f -r a8cc50c2279f finch/libgnt/gntbox.c --- a/finch/libgnt/gntbox.c Tue Jan 04 06:42:45 2011 +0000 +++ b/finch/libgnt/gntbox.c Tue Jan 04 06:55:30 2011 +0000 @@ -64,7 +64,7 @@ GntWidget *widget = GNT_WIDGET(box); int len; char *end = (char*)gnt_util_onscreen_width_to_pointer(title, widget->priv.width - 4, &len); - + if (p) *p = (widget->priv.width - len) / 2; if (r) diff -r 44f53d3fc54f -r a8cc50c2279f finch/libgnt/gntcheckbox.c --- a/finch/libgnt/gntcheckbox.c Tue Jan 04 06:42:45 2011 +0000 +++ b/finch/libgnt/gntcheckbox.c Tue Jan 04 06:55:30 2011 +0000 @@ -100,7 +100,7 @@ wclass->key_pressed = gnt_check_box_key_pressed; wclass->clicked = gnt_check_box_clicked; - signals[SIG_TOGGLED] = + signals[SIG_TOGGLED] = g_signal_new("toggled", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, diff -r 44f53d3fc54f -r a8cc50c2279f finch/libgnt/gntclipboard.c --- a/finch/libgnt/gntclipboard.c Tue Jan 04 06:42:45 2011 +0000 +++ b/finch/libgnt/gntclipboard.c Tue Jan 04 06:55:30 2011 +0000 @@ -32,7 +32,7 @@ static void gnt_clipboard_class_init(GntClipboardClass *klass) { - signals[SIG_CLIPBOARD] = + signals[SIG_CLIPBOARD] = g_signal_new("clipboard_changed", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, diff -r 44f53d3fc54f -r a8cc50c2279f finch/libgnt/gntentry.c --- a/finch/libgnt/gntentry.c Tue Jan 04 06:42:45 2011 +0000 +++ b/finch/libgnt/gntentry.c Tue Jan 04 06:55:30 2011 +0000 @@ -481,7 +481,7 @@ GntEntry *entry = GNT_ENTRY(bind); GList *iter; const char *current; - + if (entry->history->prev && entry->search->needle) current = entry->search->needle; else diff -r 44f53d3fc54f -r a8cc50c2279f finch/libgnt/gntfilesel.c --- a/finch/libgnt/gntfilesel.c Tue Jan 04 06:42:45 2011 +0000 +++ b/finch/libgnt/gntfilesel.c Tue Jan 04 06:55:30 2011 +0000 @@ -245,7 +245,7 @@ GDir *dir; GntFile *file; const char *str; - + dir = g_dir_open(path, 0, error); if (dir == NULL || (error && *error)) { return FALSE; @@ -315,7 +315,7 @@ success = sel->read_fn(sel->current, &files, err); else success = local_read_fn(sel->current, &files, err); - + if (!success || *err) { gnt_warning("error opening location %s (%s)", sel->current, *err ? (*err)->message : "reason unknown"); @@ -356,7 +356,7 @@ if (!str) return TRUE; - + path = g_build_filename(sel->current, str, NULL); dir = g_path_get_basename(sel->current); if (!gnt_file_sel_set_current_location(sel, path)) { @@ -597,7 +597,7 @@ orig_size_request = kl->size_request; kl->size_request = gnt_file_sel_size_request; - signals[SIG_FILE_SELECTED] = + signals[SIG_FILE_SELECTED] = g_signal_new("file_selected", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, diff -r 44f53d3fc54f -r a8cc50c2279f finch/libgnt/gntmain.c --- a/finch/libgnt/gntmain.c Tue Jan 04 06:42:45 2011 +0000 +++ b/finch/libgnt/gntmain.c Tue Jan 04 06:55:30 2011 +0000 @@ -126,7 +126,7 @@ if (!wm->cws->ordered || buffer[0] != 27) return FALSE; - + buffer++; if (strlen(buffer) < 5) return FALSE; @@ -177,7 +177,7 @@ if (widget && gnt_wm_process_click(wm, event, x, y, widget)) return TRUE; - + if (event == GNT_LEFT_MOUSE_DOWN && widget && widget != wm->_list.window && !GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_TRANSIENT)) { if (widget != wm->cws->ordered->data) { @@ -438,7 +438,7 @@ { const char *name = gnt_style_get(GNT_STYLE_WM); gpointer handle; - + if (name && *name) { handle = g_module_open(name, G_MODULE_BIND_LAZY); if (handle) { @@ -459,7 +459,7 @@ if (channel) return; - + locale = setlocale(LC_ALL, ""); setup_io(); @@ -554,7 +554,7 @@ GntWidget *w; if (!widget) return FALSE; - + if (GNT_IS_MENU(widget)) return TRUE; diff -r 44f53d3fc54f -r a8cc50c2279f finch/libgnt/gntprogressbar.c --- a/finch/libgnt/gntprogressbar.c Tue Jan 04 06:42:45 2011 +0000 +++ b/finch/libgnt/gntprogressbar.c Tue Jan 04 06:55:30 2011 +0000 @@ -168,7 +168,7 @@ 0, /* n_preallocs */ gnt_progress_bar_init, /* instance_init */ NULL /* value_table */ - }; + }; type = g_type_register_static (GNT_TYPE_WIDGET, "GntProgressBar", &info, 0); } diff -r 44f53d3fc54f -r a8cc50c2279f finch/libgnt/gntstyle.c --- a/finch/libgnt/gntstyle.c Tue Jan 04 06:42:45 2011 +0000 +++ b/finch/libgnt/gntstyle.c Tue Jan 04 06:55:30 2011 +0000 @@ -105,7 +105,7 @@ if (bool_styles[style] != -1) return bool_styles[style]; - + str = gnt_style_get(style); bool_styles[style] = str ? gnt_style_parse_bool(str) : def; @@ -226,7 +226,7 @@ { gsize len = 0; char **keys; - + keys = g_key_file_get_keys(gkfile, name, &len, &error); if (error) { @@ -280,7 +280,7 @@ { gsize len = 0; char **keys; - + keys = g_key_file_get_keys(gkfile, kname, &len, &error); if (error) { @@ -331,14 +331,14 @@ #if GLIB_CHECK_VERSION(2,6,0) char *name; GError *error = NULL; - + name = g_strdup_printf("%s::remap", g_type_name(type)); if (g_key_file_has_group(gkfile, name)) { gsize len = 0; char **keys; - + keys = g_key_file_get_keys(gkfile, name, &len, &error); if (error) { diff -r 44f53d3fc54f -r a8cc50c2279f finch/libgnt/gnttextview.c --- a/finch/libgnt/gnttextview.c Tue Jan 04 06:42:45 2011 +0000 +++ b/finch/libgnt/gnttextview.c Tue Jan 04 06:55:30 2011 +0000 @@ -165,7 +165,7 @@ if (showing + position > rows) position = rows - showing; - + if (showing + position == rows && view->list && view->list->prev) position = MAX(1, rows - 1 - showing); else if (showing + position < rows && view->list && !view->list->prev) @@ -456,7 +456,7 @@ GntTextView *view = GNT_TEXT_VIEW(widget); GntTextLine *line = g_new0(GntTextLine, 1); - GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW | + GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW | GNT_WIDGET_GROW_Y | GNT_WIDGET_GROW_X); widget->priv.minw = 5; widget->priv.minh = 2; @@ -636,7 +636,7 @@ list = g_list_last(view->list); view->list = list; } - + gnt_widget_draw(GNT_WIDGET(view)); } @@ -644,7 +644,7 @@ { GntTextLine *line = g_new0(GntTextLine, 1); GList *list = view->list; - + view->list = g_list_prepend(g_list_first(view->list), line); view->list = list; gnt_widget_draw(GNT_WIDGET(view)); diff -r 44f53d3fc54f -r a8cc50c2279f finch/libgnt/gnttree.c --- a/finch/libgnt/gnttree.c Tue Jan 04 06:42:45 2011 +0000 +++ b/finch/libgnt/gnttree.c Tue Jan 04 06:55:30 2011 +0000 @@ -275,7 +275,7 @@ return get_root_distance(get_prev(row)) + 1; } -/* Returns the distance between a and b. +/* Returns the distance between a and b. * If a is 'above' b, then the distance is positive */ static int get_distance(GntTreeRow *a, GntTreeRow *b) @@ -627,7 +627,7 @@ GntTree *tree = GNT_TREE(widget); redraw_tree(tree); - + GNTDEBUG; } @@ -1066,7 +1066,7 @@ ) ); - signals[SIG_SELECTION_CHANGED] = + signals[SIG_SELECTION_CHANGED] = g_signal_new("selection-changed", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, @@ -1074,7 +1074,7 @@ NULL, NULL, gnt_closure_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER); - signals[SIG_SCROLLED] = + signals[SIG_SCROLLED] = g_signal_new("scrolled", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, @@ -1082,7 +1082,7 @@ NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); - signals[SIG_TOGGLED] = + signals[SIG_TOGGLED] = g_signal_new("toggled", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, @@ -1090,7 +1090,7 @@ NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); - signals[SIG_COLLAPSED] = + signals[SIG_COLLAPSED] = g_signal_new("collapse-toggled", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, @@ -1384,7 +1384,7 @@ } } - if (pr == NULL && parent) + if (pr == NULL && parent) { pr = g_hash_table_lookup(tree->hash, parent); if (pr) @@ -1564,7 +1564,7 @@ GntTreeCol *col; g_return_if_fail(colno < tree->ncol); - + row = g_hash_table_lookup(tree->hash, key); if (row) { @@ -1601,7 +1601,7 @@ while (r->next) r = r->next; bigbro = r->key; - } + } } } row = gnt_tree_add_row_after(tree, key, row, parent, bigbro); diff -r 44f53d3fc54f -r a8cc50c2279f finch/libgnt/gntwidget.c --- a/finch/libgnt/gntwidget.c Tue Jan 04 06:42:45 2011 +0000 +++ b/finch/libgnt/gntwidget.c Tue Jan 04 06:55:30 2011 +0000 @@ -126,12 +126,12 @@ klass->lost_focus = gnt_widget_focus_change; klass->gained_focus = gnt_widget_focus_change; klass->confirm_size = gnt_widget_dummy_confirm_size; - + klass->key_pressed = NULL; klass->activate = NULL; klass->clicked = NULL; - - signals[SIG_DESTROY] = + + signals[SIG_DESTROY] = g_signal_new("destroy", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, @@ -139,7 +139,7 @@ NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - signals[SIG_GIVE_FOCUS] = + signals[SIG_GIVE_FOCUS] = g_signal_new("gained-focus", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, @@ -147,7 +147,7 @@ NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - signals[SIG_LOST_FOCUS] = + signals[SIG_LOST_FOCUS] = g_signal_new("lost-focus", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, @@ -155,7 +155,7 @@ NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - signals[SIG_ACTIVATE] = + signals[SIG_ACTIVATE] = g_signal_new("activate", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, @@ -163,7 +163,7 @@ NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - signals[SIG_MAP] = + signals[SIG_MAP] = g_signal_new("map", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, @@ -171,7 +171,7 @@ NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - signals[SIG_DRAW] = + signals[SIG_DRAW] = g_signal_new("draw", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, @@ -179,7 +179,7 @@ NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - signals[SIG_HIDE] = + signals[SIG_HIDE] = g_signal_new("hide", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, @@ -187,7 +187,7 @@ NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - signals[SIG_EXPOSE] = + signals[SIG_EXPOSE] = g_signal_new("expose", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, @@ -195,7 +195,7 @@ NULL, NULL, gnt_closure_marshal_VOID__INT_INT_INT_INT, G_TYPE_NONE, 4, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT); - signals[SIG_POSITION] = + signals[SIG_POSITION] = g_signal_new("position-set", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, @@ -203,7 +203,7 @@ NULL, NULL, gnt_closure_marshal_VOID__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); - signals[SIG_SIZE_REQUEST] = + signals[SIG_SIZE_REQUEST] = g_signal_new("size_request", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, @@ -211,7 +211,7 @@ NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - signals[SIG_SIZE_CHANGED] = + signals[SIG_SIZE_CHANGED] = g_signal_new("size_changed", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, @@ -219,7 +219,7 @@ NULL, NULL, gnt_closure_marshal_VOID__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); - signals[SIG_CONFIRM_SIZE] = + signals[SIG_CONFIRM_SIZE] = g_signal_new("confirm_size", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, @@ -227,7 +227,7 @@ NULL, NULL, gnt_closure_marshal_BOOLEAN__INT_INT, G_TYPE_BOOLEAN, 2, G_TYPE_INT, G_TYPE_INT); - signals[SIG_KEY_PRESSED] = + signals[SIG_KEY_PRESSED] = g_signal_new("key_pressed", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, @@ -236,7 +236,7 @@ gnt_closure_marshal_BOOLEAN__STRING, G_TYPE_BOOLEAN, 1, G_TYPE_STRING); - signals[SIG_CLICKED] = + signals[SIG_CLICKED] = g_signal_new("clicked", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, @@ -245,7 +245,7 @@ gnt_closure_marshal_BOOLEAN__INT_INT_INT, G_TYPE_BOOLEAN, 3, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT); - signals[SIG_CONTEXT_MENU] = + signals[SIG_CONTEXT_MENU] = g_signal_new("context-menu", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, diff -r 44f53d3fc54f -r a8cc50c2279f finch/libgnt/gntwm.c --- a/finch/libgnt/gntwm.c Tue Jan 04 06:42:45 2011 +0000 +++ b/finch/libgnt/gntwm.c Tue Jan 04 06:55:30 2011 +0000 @@ -151,7 +151,7 @@ /** * The following is a workaround for a bug in most versions of ncursesw. * Read about it in: http://article.gmane.org/gmane.comp.lib.ncurses.bugs/2751 - * + * * In short, if a panel hides one cell of a multi-cell character, then the rest * of the characters in that line get screwed. The workaround here is to erase * any such character preemptively. @@ -665,7 +665,7 @@ tree = wm->windows->tree; gnt_box_set_title(GNT_BOX(win), workspace ? "Workspace List" : "Window List"); - + populate_window_list(wm, workspace); if (wm->cws->ordered) @@ -762,7 +762,7 @@ { \ fprintf(file, "%s", end); \ } \ - } while (0) + } while (0) CHECK(A_BOLD, "", ""); CHECK(A_UNDERLINE, "", ""); @@ -800,7 +800,7 @@ ADJUST(bg.r); ADJUST(bg.b); ADJUST(bg.g); - + if (x) fprintf(file, ""); fprintf(file, "", bg.r, bg.g, bg.b, fg.r, fg.g, fg.b); @@ -916,7 +916,7 @@ shift_right(GntBindable *bindable, GList *null) { GntWM *wm = GNT_WM(bindable); - + if (wm->_list.window) return TRUE; @@ -1032,7 +1032,7 @@ if (GNT_WIDGET_IS_FLAG_SET(win, GNT_WIDGET_NO_BORDER)) return; - + d = win->window; gnt_widget_get_size(win, &w, &h); @@ -1405,8 +1405,8 @@ klass->key_pressed = NULL; klass->mouse_clicked = NULL; klass->give_focus = gnt_wm_give_focus; - - signals[SIG_NEW_WIN] = + + signals[SIG_NEW_WIN] = g_signal_new("new_win", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, @@ -1414,7 +1414,7 @@ NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); - signals[SIG_DECORATE_WIN] = + signals[SIG_DECORATE_WIN] = g_signal_new("decorate_win", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, @@ -1422,7 +1422,7 @@ NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); - signals[SIG_CLOSE_WIN] = + signals[SIG_CLOSE_WIN] = g_signal_new("close_win", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, @@ -1430,7 +1430,7 @@ NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); - signals[SIG_CONFIRM_RESIZE] = + signals[SIG_CONFIRM_RESIZE] = g_signal_new("confirm_resize", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, @@ -1439,7 +1439,7 @@ gnt_closure_marshal_BOOLEAN__POINTER_POINTER_POINTER, G_TYPE_BOOLEAN, 3, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_POINTER); - signals[SIG_CONFIRM_MOVE] = + signals[SIG_CONFIRM_MOVE] = g_signal_new("confirm_move", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, @@ -1448,7 +1448,7 @@ gnt_closure_marshal_BOOLEAN__POINTER_POINTER_POINTER, G_TYPE_BOOLEAN, 3, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_POINTER); - signals[SIG_RESIZED] = + signals[SIG_RESIZED] = g_signal_new("window_resized", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, @@ -1456,7 +1456,7 @@ NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); - signals[SIG_MOVED] = + signals[SIG_MOVED] = g_signal_new("window_moved", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, @@ -1464,7 +1464,7 @@ NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); - signals[SIG_UPDATE_WIN] = + signals[SIG_UPDATE_WIN] = g_signal_new("window_update", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, @@ -1473,7 +1473,7 @@ g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); - signals[SIG_GIVE_FOCUS] = + signals[SIG_GIVE_FOCUS] = g_signal_new("give_focus", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, @@ -1482,7 +1482,7 @@ g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); - signals[SIG_MOUSE_CLICK] = + signals[SIG_MOUSE_CLICK] = g_signal_new("mouse_clicked", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, @@ -1491,7 +1491,7 @@ gnt_closure_marshal_BOOLEAN__INT_INT_INT_POINTER, G_TYPE_BOOLEAN, 4, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_POINTER); - signals[SIG_TERMINAL_REFRESH] = + signals[SIG_TERMINAL_REFRESH] = g_signal_new("terminal-refresh", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, diff -r 44f53d3fc54f -r a8cc50c2279f finch/libgnt/test/combo.c --- a/finch/libgnt/test/combo.c Tue Jan 04 06:42:45 2011 +0000 +++ b/finch/libgnt/test/combo.c Tue Jan 04 06:55:30 2011 +0000 @@ -37,7 +37,7 @@ freopen(".error", "w", stderr); gnt_init(); #endif - + box = gnt_box_new(FALSE, TRUE); gnt_widget_set_name(box, "box"); gnt_box_set_alignment(GNT_BOX(box), GNT_ALIGN_MID); diff -r 44f53d3fc54f -r a8cc50c2279f finch/libgnt/test/focus.c --- a/finch/libgnt/test/focus.c Tue Jan 04 06:42:45 2011 +0000 +++ b/finch/libgnt/test/focus.c Tue Jan 04 06:55:30 2011 +0000 @@ -24,7 +24,7 @@ freopen(".error", "w", stderr); gnt_init(); #endif - + GntWidget *label = gnt_label_new("So wassup dudes and dudettes!!\u4e0a1\u6d772\u67003\u4f4e4\u67085\nSo this is, like,\nthe third line!! \\o/"); GntWidget *vbox, *hbox, *tree, *box, *button; WINDOW *test; @@ -78,7 +78,7 @@ gnt_box_add_widget(GNT_BOX(vbox), button); gnt_box_add_widget(GNT_BOX(hbox), vbox); - + gnt_widget_show(hbox); #ifdef STANDALONE diff -r 44f53d3fc54f -r a8cc50c2279f finch/libgnt/test/tv.c --- a/finch/libgnt/test/tv.c Tue Jan 04 06:42:45 2011 +0000 +++ b/finch/libgnt/test/tv.c Tue Jan 04 06:55:30 2011 +0000 @@ -45,7 +45,7 @@ return FALSE; return TRUE; } - + return FALSE; } diff -r 44f53d3fc54f -r a8cc50c2279f finch/libgnt/test/wm.c --- a/finch/libgnt/test/wm.c Tue Jan 04 06:42:45 2011 +0000 +++ b/finch/libgnt/test/wm.c Tue Jan 04 06:55:30 2011 +0000 @@ -35,7 +35,7 @@ gnt_widget_show(widget); } } - + return TRUE; } @@ -61,7 +61,7 @@ gnt_main(); gnt_quit(); - + return 0; } diff -r 44f53d3fc54f -r a8cc50c2279f finch/libgnt/wms/s.c --- a/finch/libgnt/wms/s.c Tue Jan 04 06:42:45 2011 +0000 +++ b/finch/libgnt/wms/s.c Tue Jan 04 06:55:30 2011 +0000 @@ -146,11 +146,11 @@ if (!widget) return FALSE; /* This might be a place to bring up a context menu */ - + if (event != GNT_LEFT_MOUSE_DOWN || GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_NO_BORDER)) return FALSE; - + gnt_widget_get_position(widget, &x, &y); gnt_widget_get_size(widget, &w, &h); diff -r 44f53d3fc54f -r a8cc50c2279f finch/plugins/gntgf.c --- a/finch/plugins/gntgf.c Tue Jan 04 06:42:45 2011 +0000 +++ b/finch/plugins/gntgf.c Tue Jan 04 06:55:30 2011 +0000 @@ -134,7 +134,7 @@ ids = getenv("WINDOWID"); if (ids == NULL) return; - + id = atoi(ids); dpy = XOpenDisplay(NULL); @@ -255,7 +255,7 @@ if (flags & PURPLE_MESSAGE_WHISPER) return; - + nick = PURPLE_CONV_CHAT(conv)->nick; if (g_utf8_collate(sender, nick) == 0) @@ -401,7 +401,7 @@ { purple_prefs_add_none("/plugins"); purple_prefs_add_none("/plugins/gnt"); - + purple_prefs_add_none("/plugins/gnt/gntgf"); purple_prefs_add_none(PREFS_EVENT); diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/certificate.c --- a/libpurple/certificate.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/certificate.c Tue Jan 04 06:55:30 2011 +0000 @@ -314,7 +314,7 @@ uid = purple_certificate_get_unique_id(issuer); ret = purple_certificate_get_times(issuer, &activation, &expiration); - if (!ret || now < activation || now > expiration) { + if (!ret || now < activation || now > expiration) { if (!ret) purple_debug_error("certificate", "...Failed to get validity times for certificate %s\n" @@ -413,7 +413,7 @@ return (array1->len == array2->len) && (0 == memcmp(array1->data, array2->data, array1->len)); } - + GByteArray * purple_certificate_get_fingerprint_sha1(PurpleCertificate *crt) { diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/conversation.c --- a/libpurple/conversation.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/conversation.c Tue Jan 04 06:55:30 2011 +0000 @@ -2298,7 +2298,7 @@ purple_value_new(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_CONVERSATION), purple_value_new(PURPLE_TYPE_UINT)); - + purple_signal_register(handle, "sent-attention", purple_marshal_VOID__POINTER_POINTER_POINTER_UINT, NULL, 4, @@ -2308,7 +2308,7 @@ purple_value_new(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_CONVERSATION), purple_value_new(PURPLE_TYPE_UINT)); - + purple_signal_register(handle, "got-attention", purple_marshal_VOID__POINTER_POINTER_POINTER_UINT, NULL, 4, @@ -2318,7 +2318,7 @@ purple_value_new(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_CONVERSATION), purple_value_new(PURPLE_TYPE_UINT)); - + purple_signal_register(handle, "sending-im-msg", purple_marshal_VOID__POINTER_POINTER_POINTER, NULL, 3, diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/example/nullclient.c --- a/libpurple/example/nullclient.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/example/nullclient.c Tue Jan 04 06:55:30 2011 +0000 @@ -96,7 +96,7 @@ return closure->result; } -static PurpleEventLoopUiOps glib_eventloops = +static PurpleEventLoopUiOps glib_eventloops = { g_timeout_add, g_source_remove, @@ -134,7 +134,7 @@ name, message); } -static PurpleConversationUiOps null_conv_uiops = +static PurpleConversationUiOps null_conv_uiops = { NULL, /* create_conversation */ NULL, /* destroy_conversation */ @@ -167,7 +167,7 @@ purple_conversations_set_ui_ops(&null_conv_uiops); } -static PurpleCoreUiOps null_core_uiops = +static PurpleCoreUiOps null_core_uiops = { NULL, NULL, diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/ft.c --- a/libpurple/ft.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/ft.c Tue Jan 04 06:55:30 2011 +0000 @@ -274,7 +274,7 @@ } } -static void +static void purple_xfer_conversation_write_internal(PurpleXfer *xfer, const char *message, gboolean is_error, gboolean print_thumbnail) { @@ -302,12 +302,12 @@ if (print_thumbnail && thumbnail_data) { gchar *message_with_img; - gpointer data = g_memdup(thumbnail_data, size); + gpointer data = g_memdup(thumbnail_data, size); int id = purple_imgstore_add_with_id(data, size, NULL); - message_with_img = + message_with_img = g_strdup_printf(" %s", id, escaped); - purple_conversation_write(conv, NULL, message_with_img, flags, + purple_conversation_write(conv, NULL, message_with_img, flags, time(NULL)); purple_imgstore_unref_by_id(id); g_free(message_with_img); @@ -530,7 +530,7 @@ xfer, G_CALLBACK(purple_xfer_choose_file), G_CALLBACK(cancel_recv_cb)); } - + g_free(buf); } else purple_xfer_choose_file(xfer); diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/media.c --- a/libpurple/media.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/media.c Tue Jan 04 06:55:30 2011 +0000 @@ -190,7 +190,7 @@ { GObjectClass *gobject_class = (GObjectClass*)klass; parent_class = g_type_class_peek_parent(klass); - + gobject_class->dispose = purple_media_dispose; gobject_class->finalize = purple_media_finalize; gobject_class->set_property = purple_media_set_property; @@ -416,7 +416,7 @@ case PROP_PRPL_DATA: media->priv->prpl_data = g_value_get_pointer(value); break; - default: + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; } @@ -427,7 +427,7 @@ { PurpleMedia *media; g_return_if_fail(PURPLE_IS_MEDIA(object)); - + media = PURPLE_MEDIA(object); switch (prop_id) { @@ -450,8 +450,8 @@ case PROP_PRPL_DATA: g_value_set_pointer(value, media->priv->prpl_data); break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; } @@ -490,7 +490,7 @@ { GList *streams; GList *ret = NULL; - + g_return_val_if_fail(PURPLE_IS_MEDIA(media), NULL); streams = media->priv->streams; @@ -535,7 +535,7 @@ const gchar *name, gboolean initiator) { PurpleMediaStream *media_stream; - + g_return_val_if_fail(session != NULL, NULL); media_stream = g_new0(PurpleMediaStream, 1); diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/media/backend-fs2.c --- a/libpurple/media/backend-fs2.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/media/backend-fs2.c Tue Jan 04 06:55:30 2011 +0000 @@ -305,7 +305,7 @@ G_CALLBACK(stream_info_cb), PURPLE_MEDIA_BACKEND_FS2(object)); break; - default: + default: G_OBJECT_WARN_INVALID_PROPERTY_ID( object, prop_id, pspec); break; @@ -318,7 +318,7 @@ { PurpleMediaBackendFs2Private *priv; g_return_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(object)); - + priv = PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(object); switch (prop_id) { @@ -328,7 +328,7 @@ case PROP_MEDIA: g_value_set_object(value, priv->media); break; - default: + default: G_OBJECT_WARN_INVALID_PROPERTY_ID( object, prop_id, pspec); break; @@ -1261,7 +1261,7 @@ if ((type_direction & FS_DIRECTION_SEND) == 0) return TRUE; - + session_type = session_type_from_fs( media_type, FS_DIRECTION_SEND); src = purple_media_manager_get_element( @@ -1329,7 +1329,7 @@ srcpad = gst_element_get_request_pad(session->tee, "src%d"); } - purple_debug_info("backend-fs2", "connecting pad: %s\n", + purple_debug_info("backend-fs2", "connecting pad: %s\n", gst_pad_link(srcpad, sinkpad) == GST_PAD_LINK_OK ? "success" : "failure"); gst_element_set_locked_state(session->src, FALSE); @@ -1582,7 +1582,7 @@ { GValue value; GstStructure *turn_setup = gst_structure_new("relay-info", - "ip", G_TYPE_STRING, ip, + "ip", G_TYPE_STRING, ip, "port", G_TYPE_UINT, port, "username", G_TYPE_STRING, username, "password", G_TYPE_STRING, password, @@ -1599,7 +1599,7 @@ return relay_info; } - + static gboolean create_stream(PurpleMediaBackendFs2 *self, const gchar *sess_id, const gchar *who, @@ -1642,7 +1642,7 @@ ++_num_params; if (stun_ip) { - purple_debug_info("backend-fs2", + purple_debug_info("backend-fs2", "Setting stun-ip on new stream: %s\n", stun_ip); _params[_num_params].name = "stun-ip"; @@ -1668,11 +1668,11 @@ /* should add TCP and perhaps TLS relaying options when these are supported by libnice using non-google mode */ - + purple_debug_info("backend-fs2", "Setting relay-info on new stream\n"); _params[_num_params].name = "relay-info"; - g_value_init(&_params[_num_params].value, + g_value_init(&_params[_num_params].value, G_TYPE_VALUE_ARRAY); g_value_set_boxed(&_params[_num_params].value, relay_info); diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/media/candidate.c --- a/libpurple/media/candidate.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/media/candidate.c Tue Jan 04 06:55:30 2011 +0000 @@ -163,7 +163,7 @@ case PROP_TTL: priv->ttl = g_value_get_uint(value); break; - default: + default: G_OBJECT_WARN_INVALID_PROPERTY_ID( object, prop_id, pspec); break; @@ -176,7 +176,7 @@ { PurpleMediaCandidatePrivate *priv; g_return_if_fail(PURPLE_IS_MEDIA_CANDIDATE(object)); - + priv = PURPLE_MEDIA_CANDIDATE_GET_PRIVATE(object); switch (prop_id) { @@ -227,7 +227,7 @@ purple_media_candidate_class_init(PurpleMediaCandidateClass *klass) { GObjectClass *gobject_class = (GObjectClass*)klass; - + gobject_class->finalize = purple_media_candidate_finalize; gobject_class->set_property = purple_media_candidate_set_property; gobject_class->get_property = purple_media_candidate_get_property; diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/media/codec.c --- a/libpurple/media/codec.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/media/codec.c Tue Jan 04 06:55:30 2011 +0000 @@ -120,7 +120,7 @@ case PROP_OPTIONAL_PARAMS: priv->optional_params = g_value_get_pointer(value); break; - default: + default: G_OBJECT_WARN_INVALID_PROPERTY_ID( object, prop_id, pspec); break; @@ -133,7 +133,7 @@ { PurpleMediaCodecPrivate *priv; g_return_if_fail(PURPLE_IS_MEDIA_CODEC(object)); - + priv = PURPLE_MEDIA_CODEC_GET_PRIVATE(object); switch (prop_id) { @@ -155,7 +155,7 @@ case PROP_OPTIONAL_PARAMS: g_value_set_pointer(value, priv->optional_params); break; - default: + default: G_OBJECT_WARN_INVALID_PROPERTY_ID( object, prop_id, pspec); break; @@ -166,7 +166,7 @@ purple_media_codec_class_init(PurpleMediaCodecClass *klass) { GObjectClass *gobject_class = (GObjectClass*)klass; - + gobject_class->finalize = purple_media_codec_finalize; gobject_class->set_property = purple_media_codec_set_property; gobject_class->get_property = purple_media_codec_get_property; diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/mediamanager.c --- a/libpurple/mediamanager.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/mediamanager.c Tue Jan 04 06:55:30 2011 +0000 @@ -140,7 +140,7 @@ { GObjectClass *gobject_class = (GObjectClass*)klass; parent_class = g_type_class_peek_parent(klass); - + gobject_class->finalize = purple_media_manager_finalize; purple_media_manager_signals[INIT_MEDIA] = g_signal_new ("init-media", @@ -928,7 +928,7 @@ GType purple_media_manager_get_backend_type(PurpleMediaManager *manager) -{ +{ #ifdef USE_VV g_return_val_if_fail(PURPLE_IS_MEDIA_MANAGER(manager), PURPLE_MEDIA_CAPS_NONE); @@ -1070,7 +1070,7 @@ case PROP_CREATE_CB: priv->create = g_value_get_pointer(value); break; - default: + default: G_OBJECT_WARN_INVALID_PROPERTY_ID( object, prop_id, pspec); break; @@ -1083,7 +1083,7 @@ { PurpleMediaElementInfoPrivate *priv; g_return_if_fail(PURPLE_IS_MEDIA_ELEMENT_INFO(object)); - + priv = PURPLE_MEDIA_ELEMENT_INFO_GET_PRIVATE(object); switch (prop_id) { @@ -1099,7 +1099,7 @@ case PROP_CREATE_CB: g_value_set_pointer(value, priv->create); break; - default: + default: G_OBJECT_WARN_INVALID_PROPERTY_ID( object, prop_id, pspec); break; @@ -1110,7 +1110,7 @@ purple_media_element_info_class_init(PurpleMediaElementInfoClass *klass) { GObjectClass *gobject_class = (GObjectClass*)klass; - + gobject_class->finalize = purple_media_element_info_finalize; gobject_class->set_property = purple_media_element_info_set_property; gobject_class->get_property = purple_media_element_info_get_property; diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/network.c --- a/libpurple/network.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/network.c Tue Jan 04 06:55:30 2011 +0000 @@ -271,7 +271,7 @@ inet_ntop(AF_INET, &sinptr->sin_addr, dst, sizeof(dst)); - purple_debug_info("network", + purple_debug_info("network", "found local i/f with address %s on IPv4\n", dst); if (!purple_strequal(dst, "127.0.0.1")) { result = g_list_append(result, g_strdup(dst)); @@ -873,7 +873,7 @@ purple_prefs_get_string("/purple/network/stun_server")); purple_network_set_turn_server( purple_prefs_get_string("/purple/network/turn_server")); - + if (ui_ops != NULL && ui_ops->network_connected != NULL) ui_ops->network_connected(); break; @@ -936,10 +936,10 @@ #endif static void -purple_network_ip_lookup_cb(GSList *hosts, gpointer data, +purple_network_ip_lookup_cb(GSList *hosts, gpointer data, const char *error_message) { - const gchar **ip = (const gchar **) data; + const gchar **ip = (const gchar **) data; if (error_message) { purple_debug_error("network", "lookup of IP address failed: %s\n", @@ -949,14 +949,14 @@ } if (hosts && g_slist_next(hosts)) { - struct sockaddr *addr = g_slist_next(hosts)->data; + struct sockaddr *addr = g_slist_next(hosts)->data; char dst[INET6_ADDRSTRLEN]; - + if (addr->sa_family == AF_INET6) { - inet_ntop(addr->sa_family, &((struct sockaddr_in6 *) addr)->sin6_addr, + inet_ntop(addr->sa_family, &((struct sockaddr_in6 *) addr)->sin6_addr, dst, sizeof(dst)); } else { - inet_ntop(addr->sa_family, &((struct sockaddr_in *) addr)->sin_addr, + inet_ntop(addr->sa_family, &((struct sockaddr_in *) addr)->sin_addr, dst, sizeof(dst)); } @@ -981,7 +981,7 @@ purple_dnsquery_a(stun_server, 3478, purple_network_ip_lookup_cb, &stun_ip); } else { - purple_debug_info("network", + purple_debug_info("network", "network is unavailable, don't try to update STUN IP"); } } else if (stun_ip) { @@ -996,11 +996,11 @@ if (turn_server && turn_server[0] != '\0') { if (purple_network_is_available()) { purple_debug_info("network", "running DNS query for TURN server\n"); - purple_dnsquery_a(turn_server, - purple_prefs_get_int("/purple/network/turn_port"), + purple_dnsquery_a(turn_server, + purple_prefs_get_int("/purple/network/turn_port"), purple_network_ip_lookup_cb, &turn_ip); } else { - purple_debug_info("network", + purple_debug_info("network", "network is unavailable, don't try to update TURN IP"); } } else if (turn_ip) { diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/plugins/autoaccept.c --- a/libpurple/plugins/autoaccept.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/plugins/autoaccept.c Tue Jan 04 06:55:30 2011 +0000 @@ -105,7 +105,7 @@ } else { accept_setting = purple_prefs_get_int(PREF_STRANGER); } - + switch (accept_setting) { case FT_ASK: @@ -197,7 +197,7 @@ node = purple_blist_node_get_parent(node); g_return_if_fail(PURPLE_BLIST_NODE_IS_CONTACT(node)); - message = g_strdup_printf(_("When a file-transfer request arrives from %s"), + message = g_strdup_printf(_("When a file-transfer request arrives from %s"), purple_contact_get_alias((PurpleContact *)node)); purple_request_choice(plugin, _("Set Autoaccept Setting"), message, NULL, purple_blist_node_get_int(node, "autoaccept"), diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/plugins/codeinline.c --- a/libpurple/plugins/codeinline.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/plugins/codeinline.c Tue Jan 04 06:55:30 2011 +0000 @@ -62,7 +62,7 @@ { PURPLE_PLUGIN_MAGIC, PURPLE_MAJOR_VERSION, - PURPLE_MINOR_VERSION, + PURPLE_MINOR_VERSION, PURPLE_PLUGIN_STANDARD, NULL, 0, diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/plugins/log_reader.c --- a/libpurple/plugins/log_reader.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/plugins/log_reader.c Tue Jan 04 06:55:30 2011 +0000 @@ -1587,7 +1587,7 @@ if (buddy != NULL) alias = purple_buddy_get_alias(buddy); - + if (alias != NULL) g_string_append(formatted, alias); else @@ -1824,7 +1824,7 @@ purple_str_has_prefix(c, QIP_LOG_OUT_MESSAGE)) { char *tmp; - + new_line = c; /* find EOL */ @@ -1886,7 +1886,7 @@ data->offset = offset; offset += data->length; purple_debug_info("QIP logger list", - "Creating log: path = (%s); length = (%d); offset = (%d)\n", + "Creating log: path = (%s); length = (%d); offset = (%d)\n", data->path, data->length, data->offset); /* XXX: Look into this later... Should we pass in a struct tm? */ @@ -2323,7 +2323,7 @@ file = g_fopen(data->path, "rb"); g_return_val_if_fail(file != NULL, g_strdup("")); - + fseek(file, data->offset, SEEK_SET); data->length = fread(contents, 1, data->length, file); fclose(file); @@ -2417,7 +2417,7 @@ g_return_val_if_fail(log != NULL, 0); data = log->logger_data; - + if (purple_prefs_get_bool("/plugins/core/log_reader/fast_sizes")) { return data ? data->length : 0; } diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/plugins/mono/loader/blist-glue.c --- a/libpurple/plugins/mono/loader/blist-glue.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/plugins/mono/loader/blist-glue.c Tue Jan 04 06:55:30 2011 +0000 @@ -6,21 +6,21 @@ MonoObject* purple_blist_get_handle_glue(void) { void *handle = purple_blist_get_handle(); - + return mono_value_box(ml_get_domain(), mono_get_intptr_class(), &handle); } MonoObject* purple_blist_build_buddy_object(void* data) { MonoObject *obj = NULL; - + PurpleBuddy *buddy = (PurpleBuddy*)data; - + obj = ml_create_api_object("Buddy"); g_return_val_if_fail(obj != NULL, NULL); - + ml_set_prop_string(obj, "Name", (char*)purple_buddy_get_name(buddy)); ml_set_prop_string(obj, "Alias", (char*)purple_buddy_get_alias(buddy)); - + return obj; } diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/plugins/mono/loader/debug-glue.c --- a/libpurple/plugins/mono/loader/debug-glue.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/plugins/mono/loader/debug-glue.c Tue Jan 04 06:55:30 2011 +0000 @@ -5,12 +5,12 @@ { char *ccat; char *cstr; - + ccat = mono_string_to_utf8(cat); cstr = mono_string_to_utf8(str); - + purple_debug(type, ccat, "%s", cstr); - + g_free(ccat); g_free(cstr); } diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/plugins/mono/loader/mono-helper.c --- a/libpurple/plugins/mono/loader/mono-helper.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/plugins/mono/loader/mono-helper.c Tue Jan 04 06:55:30 2011 +0000 @@ -22,57 +22,57 @@ gboolean ml_init() { MonoDomain *d; - + g_return_val_if_fail(_runtime_active == FALSE, TRUE); - + d = mono_jit_init("purple"); - + if (!d) { ml_set_domain(NULL); return FALSE; } - + ml_set_domain(d); - + ml_init_internal_calls(); - + _runtime_active = TRUE; - + return TRUE; } void ml_uninit() { g_return_if_fail(_runtime_active == TRUE); - + mono_jit_cleanup(ml_get_domain()); - + ml_set_domain(NULL); - + _runtime_active = FALSE; } MonoObject* ml_delegate_invoke(MonoObject *method, void **params) { MonoObject *ret, *exception; - + ret = mono_runtime_delegate_invoke(method, params, &exception); if (exception) { purple_debug(PURPLE_DEBUG_ERROR, "mono", "caught exception: %s\n", mono_class_get_name(mono_object_get_class(exception))); } - + return ret; } MonoObject* ml_invoke(MonoMethod *method, void *obj, void **params) { MonoObject *ret, *exception; - + ret = mono_runtime_invoke(method, obj, params, &exception); if (exception) { purple_debug(PURPLE_DEBUG_ERROR, "mono", "caught exception: %s\n", mono_class_get_name(mono_object_get_class(exception))); } - + return ret; } @@ -84,15 +84,15 @@ total = mono_image_get_table_rows (image, MONO_TABLE_TYPEDEF); for (i = 1; i <= total; ++i) { klass = mono_class_get (image, MONO_TOKEN_TYPE_DEF | i); - + pklass = mono_class_get_parent(klass); if (pklass) { - + if (strcmp("Plugin", mono_class_get_name(pklass)) == 0) return klass; } } - + return NULL; } @@ -102,15 +102,15 @@ MonoProperty *prop; MonoString *str; gpointer args[1]; - + klass = mono_object_get_class(obj); - + prop = mono_class_get_property_from_name(klass, field); - + str = mono_string_new(ml_get_domain(), data); - + args[0] = str; - + mono_property_set_value(prop, obj, args, NULL); } @@ -119,13 +119,13 @@ MonoClass *klass; MonoProperty *prop; MonoString *str; - + klass = mono_object_get_class(obj); - + prop = mono_class_get_property_from_name(klass, field); - + str = (MonoString*)mono_property_get_value(prop, obj, NULL, NULL); - + return mono_string_to_utf8(str); } @@ -133,16 +133,16 @@ { MonoClass *klass; MonoProperty *prop; - + klass = mono_class_get_parent(mono_object_get_class(obj)); - + prop = mono_class_get_property_from_name(klass, "Info"); - + return mono_property_get_value(prop, obj, NULL, NULL); } gboolean ml_is_api_dll(MonoImage *image) -{ +{ MonoClass *klass; int i, total; @@ -155,7 +155,7 @@ return TRUE; } } - + return FALSE; } @@ -167,7 +167,7 @@ MonoObject* ml_object_from_purple_subtype(PurpleSubType type, gpointer data) { MonoObject *obj = NULL; - + switch (type) { case PURPLE_SUBTYPE_BLIST_BUDDY: obj = purple_blist_build_buddy_object(data); @@ -178,7 +178,7 @@ default: break; } - + return obj; } @@ -186,21 +186,21 @@ { MonoObject *obj = NULL; MonoClass *klass = NULL; - + klass = mono_class_from_name(ml_get_api_image(), "Purple", class_name); if (!klass) { purple_debug(PURPLE_DEBUG_FATAL, "mono", "couldn't find the '%s' class\n", class_name); return NULL; } - + obj = mono_object_new(ml_get_domain(), klass); if (!obj) { purple_debug(PURPLE_DEBUG_FATAL, "mono", "couldn't create the object from class '%s'\n", class_name); return NULL; } - + mono_runtime_object_init(obj); - + return obj; } @@ -241,7 +241,7 @@ { if (!plugins_hash) plugins_hash = g_hash_table_new(NULL, NULL); - + g_hash_table_insert(plugins_hash, plugin->klass, plugin); } diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/plugins/mono/loader/signal-glue.c --- a/libpurple/plugins/mono/loader/signal-glue.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/plugins/mono/loader/signal-glue.c Tue Jan 04 06:55:30 2011 +0000 @@ -22,13 +22,13 @@ int i; gpointer meth_args[1]; gpointer purple_obj; - + va_list args; - + va_start(args, num_vals); - + array = mono_array_new(ml_get_domain(), mono_get_object_class(), num_vals); - + for (i = 0; i < num_vals; i++) { if (purple_value_get_type(sig_data->values[i]) == PURPLE_TYPE_SUBTYPE) { purple_obj = va_arg(args, gpointer); @@ -40,22 +40,22 @@ mono_array_set(array, MonoObject*, i, obj); } } - + va_end(args); - + meth_args[0] = array; - - return ml_delegate_invoke(sig_data->func, meth_args); + + return ml_delegate_invoke(sig_data->func, meth_args); } static void cb_void__pointer(void *arg1, void *data) { - dispatch_callback((SignalData*)data, ((SignalData*)data)->num_vals, arg1); + dispatch_callback((SignalData*)data, ((SignalData*)data)->num_vals, arg1); } static void cb_void__pointer_pointer_pointer(void *arg1, void *arg2, void *arg3, void *data) { - dispatch_callback((SignalData*)data, ((SignalData*)data)->num_vals, arg1, arg2, arg3); + dispatch_callback((SignalData*)data, ((SignalData*)data)->num_vals, arg1, arg2, arg3); } @@ -66,23 +66,23 @@ SignalData *sig_data; PurpleMonoPlugin *mplug; MonoClass *klass; - + sig = mono_string_to_utf8(signal); purple_debug(PURPLE_DEBUG_INFO, "mono", "connecting signal: %s\n", sig); - + instance = (void*)mono_object_unbox(h); - + sig_data = g_new0(SignalData, 1); - + sig_data->func = func; sig_data->signal = sig; - + purple_signal_get_values(*instance, sig, &sig_data->ret_value, &sig_data->num_vals, &sig_data->values); - + klass = mono_object_get_class(plugin); - + mplug = ml_find_plugin_by_class(klass); - + mplug->signal_data = g_list_append(mplug->signal_data, (gpointer)sig_data); return purple_signal_connect(*instance, sig, (gpointer)klass, get_callback(sig_data), (gpointer)sig_data); @@ -104,7 +104,7 @@ } } -static gpointer callbacks[]= { +static gpointer callbacks[]= { NULL, cb_void__pointer, NULL, @@ -112,7 +112,7 @@ }; static int callbacks_array_size = sizeof(callbacks) / sizeof(PurpleCallback); - + static PurpleCallback get_callback(SignalData *sig_data) { @@ -122,18 +122,18 @@ index = 0; else index = determine_index(purple_value_get_type(sig_data->ret_value)); - + for (i = 0; i < sig_data->num_vals; i++) { index += determine_index(purple_value_get_type(sig_data->values[i])); } - + purple_debug(PURPLE_DEBUG_INFO, "mono", "get_callback index = %d\n", index); - + if (index >= callbacks_array_size || callbacks[index] == NULL) { purple_debug(PURPLE_DEBUG_ERROR, "mono", "couldn't find a callback function for signal: %s\n", sig_data->signal); return NULL; } - + purple_debug(PURPLE_DEBUG_MISC, "mono", "using callback at index: %d\n", index); return PURPLE_CALLBACK(callbacks[index]); } diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/plugins/mono/loader/status-glue.c --- a/libpurple/plugins/mono/loader/status-glue.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/plugins/mono/loader/status-glue.c Tue Jan 04 06:55:30 2011 +0000 @@ -6,11 +6,11 @@ { MonoObject *obj = NULL; PurpleStatus *status = (PurpleStatus*)data; - + obj = ml_create_api_object("Status"); g_return_val_if_fail(obj != NULL, NULL); - + ml_set_prop_string(obj, "Id", (char*)purple_status_get_id(status)); - + return obj; } diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/plugins/offlinemsg.c --- a/libpurple/plugins/offlinemsg.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/plugins/offlinemsg.c Tue Jan 04 06:55:30 2011 +0000 @@ -89,7 +89,7 @@ purple_pounce_action_set_enabled(pounce, "send-message", TRUE); purple_pounce_action_set_attribute(pounce, "send-message", "message", offline->message); - + conv = offline->conv; if (!purple_conversation_get_data(conv, "plugin_pack:offlinemsg")) purple_conversation_write(conv, NULL, _("The rest of the messages will be saved " @@ -156,7 +156,7 @@ ask = g_strdup_printf(_("\"%s\" is currently offline. Do you want to save the " "rest of the messages in a pounce and automatically send them " "when \"%s\" logs back in?"), who, who); - + purple_request_action(handle, _("Offline Message"), ask, _("You can edit/delete the pounce from the `Buddy Pounces' dialog"), 0, diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/plugins/psychic.c --- a/libpurple/plugins/psychic.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/plugins/psychic.c Tue Jan 04 06:55:30 2011 +0000 @@ -85,9 +85,9 @@ PurplePluginPrefFrame *frame; PurplePluginPref *pref; - + frame = purple_plugin_pref_frame_new(); - + pref = purple_plugin_pref_new_with_name(PREF_BUDDIES); purple_plugin_pref_set_label(pref, _("Only enable for users on" " the buddy list")); @@ -118,7 +118,7 @@ purple_signal_connect(convs_handle, "buddy-typing", plugin, PURPLE_CALLBACK(buddy_typing_cb), NULL); - + return TRUE; } @@ -127,7 +127,7 @@ get_plugin_pref_frame, 0, /* page_num (Reserved) */ NULL, /* frame (Reserved) */ - + /* padding */ NULL, NULL, @@ -145,7 +145,7 @@ 0, /**< flags */ NULL, /**< dependencies */ PURPLE_PRIORITY_DEFAULT, /**< priority */ - + PLUGIN_ID, /**< id */ PLUGIN_NAME, /**< name */ DISPLAY_VERSION, /**< version */ @@ -153,11 +153,11 @@ PLUGIN_DESC, /**< description */ PLUGIN_AUTHOR, /**< author */ PURPLE_WEBSITE, /**< homepage */ - + plugin_load, /**< load */ NULL, /**< unload */ NULL, /**< destroy */ - + NULL, /**< ui_info */ NULL, /**< extra_info */ &prefs_info, /**< prefs_info */ diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/plugins/ssl/ssl-nss.c --- a/libpurple/plugins/ssl/ssl-nss.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/plugins/ssl/ssl-nss.c Tue Jan 04 06:55:30 2011 +0000 @@ -289,13 +289,13 @@ GList * peer_certs = NULL; int count; int64 now = PR_Now(); - + curcert = SSL_PeerCertificate(socket); if (curcert == NULL) { purple_debug_error("nss", "could not DupCertificate\n"); return NULL; } - + for (count = 0 ; count < CERT_MAX_CERT_CHAIN ; count++) { purple_debug_info("nss", "subject=%s issuer=%s\n", curcert->subjectName, curcert->issuerName ? curcert->issuerName : "(null)"); @@ -530,7 +530,7 @@ CERT_DestroyCertificate(cert); #endif - + return NULL; } @@ -587,7 +587,7 @@ crt = g_new0(PurpleCertificate, 1); crt->scheme = &x509_nss; crt->data = crt_dat; - + return crt; } @@ -672,7 +672,7 @@ purple_debug_info("nss/x509", "Exporting certificate to %s\n", filename); - + /* First, use NSS voodoo to create a DER-formatted certificate */ dercrt = SEC_ASN1EncodeItem(NULL, NULL, crt_dat, SEC_ASN1_GET(SEC_SignedCertificateTemplate)); @@ -692,7 +692,7 @@ ret = purple_util_write_data_to_file_absolute(filename, pemcrt, -1); g_free(pemcrt); - + return ret; } @@ -713,7 +713,7 @@ newcrt->scheme = &x509_nss; /* NSS does refcounting automatically */ newcrt->data = CERT_DupCertificate(crt_dat); - + return newcrt; } @@ -759,7 +759,7 @@ CERTCertificate *subjectCert; CERTCertificate *issuerCert; SECStatus st; - + issuerCert = X509_NSS_DATA(issuer); g_return_val_if_fail(issuerCert, FALSE); @@ -795,7 +795,7 @@ sha1sum = g_byte_array_sized_new(hashlen); /* glib leaves the size as 0 by default */ sha1sum->len = hashlen; - + st = PK11_HashBuf(SEC_OID_SHA1, sha1sum->data, derCert->data, derCert->len); @@ -814,7 +814,7 @@ x509_dn (PurpleCertificate *crt) { CERTCertificate *crt_dat; - + g_return_val_if_fail(crt, NULL); g_return_val_if_fail(crt->scheme == &x509_nss, NULL); @@ -828,7 +828,7 @@ x509_issuer_dn (PurpleCertificate *crt) { CERTCertificate *crt_dat; - + g_return_val_if_fail(crt, NULL); g_return_val_if_fail(crt->scheme == &x509_nss, NULL); @@ -844,7 +844,7 @@ CERTCertificate *crt_dat; char *nss_cn; gchar *ret_cn; - + g_return_val_if_fail(crt, NULL); g_return_val_if_fail(crt->scheme == &x509_nss, NULL); @@ -875,7 +875,7 @@ { CERTCertificate *crt_dat; SECStatus st; - + g_return_val_if_fail(crt, FALSE); g_return_val_if_fail(crt->scheme == &x509_nss, FALSE); @@ -890,7 +890,7 @@ else if (st == SECFailure) { return FALSE; } - + /* If we get here...bad things! */ purple_debug_error("nss/x509", "x509_check_name fell through where it shouldn't " @@ -903,7 +903,7 @@ { CERTCertificate *crt_dat; PRTime nss_activ, nss_expir; - + g_return_val_if_fail(crt, FALSE); g_return_val_if_fail(crt->scheme == &x509_nss, FALSE); @@ -926,7 +926,7 @@ if (expiration) { *expiration = nss_expir / 1000000; } - + return TRUE; } diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/plugins/tcl/tcl_cmds.c --- a/libpurple/plugins/tcl/tcl_cmds.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/plugins/tcl/tcl_cmds.c Tue Jan 04 06:55:30 2011 +0000 @@ -4,7 +4,7 @@ * purple * * Copyright (C) 2003 Ethan Blanton - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -184,7 +184,7 @@ if ((account = tcl_validate_account(objv[2], interp)) == NULL) return TCL_ERROR; if (objc == 3) { - Tcl_SetObjResult(interp, + Tcl_SetObjResult(interp, Tcl_NewBooleanObj( purple_account_get_enabled(account, purple_core_get_ui()))); @@ -209,7 +209,7 @@ Tcl_WrongNumArgs(interp, 2, objv, ""); return TCL_ERROR; } - Tcl_SetObjResult(interp, + Tcl_SetObjResult(interp, purple_tcl_ref_new(PurpleTclRefHandle, purple_accounts_get_handle())); break; @@ -374,7 +374,7 @@ } if ((account = tcl_validate_account(objv[2], interp)) == NULL) return TCL_ERROR; - Tcl_SetObjResult(interp, + Tcl_SetObjResult(interp, Tcl_NewStringObj((char *)purple_account_get_username(account), -1)); break; } @@ -865,7 +865,7 @@ return error; from = Tcl_GetString(objv[4]); what = Tcl_GetString(objv[5]); - + switch (style) { case CMD_CONV_WRITE_SEND: flags = PURPLE_MESSAGE_SEND; @@ -1426,7 +1426,7 @@ Tcl_WrongNumArgs(interp, 2, objv, ""); return TCL_ERROR; } - Tcl_SetObjResult(interp, + Tcl_SetObjResult(interp, purple_tcl_ref_new(PurpleTclRefHandle, purple_savedstatuses_get_handle())); break; @@ -1809,7 +1809,7 @@ /* This isn't exactly OK, but heh. What do you do? */ return TCL_OK; } - /* We can't unload immediately, but we can unload at the first + /* We can't unload immediately, but we can unload at the first * known safe opportunity. */ purple_timeout_add(0, unload_self, (gpointer)plugin); diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/plugins/tcl/tcl_glib.c --- a/libpurple/plugins/tcl/tcl_glib.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/plugins/tcl/tcl_glib.c Tue Jan 04 06:55:30 2011 +0000 @@ -43,7 +43,7 @@ /* * NOTES - * + * * This file was developed for the Purple project. It inserts the Tcl * event loop into the glib2 event loop for the purposes of providing * Tcl bindings in a glib2 (e.g. Gtk2) program. To use it, simply @@ -51,9 +51,9 @@ * function tcl_glib_init() before creating or using any Tcl * interpreters. Then go ahead and use Tcl, Tk, whatever to your * heart's content. - * + * * BUGS - * + * * tcl_wait_for_event seems to have a bug that makes vwait not work so * well... I'm not sure why, yet, but I haven't put much time into * it. Hopefully I will figure it out soon. In the meantime, this @@ -159,7 +159,7 @@ if (g_hash_table_lookup(tcl_file_handlers, GINT_TO_POINTER(fd))) tcl_delete_file_handler(fd); - + if (mask & TCL_READABLE) cond |= G_IO_IN; if (mask & TCL_WRITABLE) diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/plugins/tcl/tcl_ref.c --- a/libpurple/plugins/tcl/tcl_ref.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/plugins/tcl/tcl_ref.c Tue Jan 04 06:55:30 2011 +0000 @@ -4,7 +4,7 @@ * purple * * Copyright (C) 2006 Ethan Blanton - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/plugins/tcl/tcl_signals.c --- a/libpurple/plugins/tcl/tcl_signals.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/plugins/tcl/tcl_signals.c Tue Jan 04 06:55:30 2011 +0000 @@ -4,7 +4,7 @@ * purple * * Copyright (C) 2003 Ethan Blanton - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -117,7 +117,7 @@ for (cur = tcl_callbacks; cur != NULL; cur = g_list_next(cur)) { handler = cur->data; - if (handler->interp == interp && handler->instance == instance + if (handler->interp == interp && handler->instance == instance && !strcmp(signal, Tcl_GetString(handler->signal))) { purple_signal_disconnect(instance, signal, handler->interp, PURPLE_CALLBACK(tcl_signal_callback)); diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/gg/buddylist.c --- a/libpurple/protocols/gg/buddylist.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/gg/buddylist.c Tue Jan 04 06:55:30 2011 +0000 @@ -82,7 +82,7 @@ gchar **users_tbl; int i; char *utf8buddylist = charset_convert(buddylist, "CP1250", "UTF-8"); - + /* Don't limit the number of records in a buddylist. */ users_tbl = g_strsplit(utf8buddylist, "\r\n", -1); @@ -95,7 +95,7 @@ data_tbl = g_strsplit(users_tbl[i], ";", 8); if (ggp_array_size(data_tbl) < 8) { - purple_debug_warning("gg", + purple_debug_warning("gg", "Something is wrong on line %d of the buddylist. Skipping.\n", i + 1); continue; diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/gg/gg.c --- a/libpurple/protocols/gg/gg.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/gg/gg.c Tue Jan 04 06:55:30 2011 +0000 @@ -215,7 +215,7 @@ char *buddylist = ggp_buddylist_dump(purple_connection_get_account(gc)); purple_debug_info("gg", "Uploading...\n"); - + if (buddylist == NULL) return; @@ -1729,7 +1729,7 @@ gc->inpa = purple_input_add(info->session->fd, PURPLE_INPUT_READ, ggp_callback_recv, gc); - + ggp_buddylist_send(gc); purple_connection_update_progress(gc, _("Connected"), 1, 2); purple_connection_set_state(gc, PURPLE_CONNECTED); @@ -1844,7 +1844,7 @@ types = g_list_append(types, type); /* - * New statuses for GG 8.0 like PoGGadaj ze mna (not yet because + * New statuses for GG 8.0 like PoGGadaj ze mna (not yet because * libpurple can't support Chatty status) and Nie przeszkadzac */ type = purple_status_type_new_with_attrs( @@ -1852,7 +1852,7 @@ "message", _("Message"), purple_value_new(PURPLE_TYPE_STRING), NULL); types = g_list_append(types, type); - + /* * This status is necessary to display guys who are blocking *us*. */ @@ -1956,7 +1956,7 @@ glp->encoding = GG_ENCODING_UTF8; glp->protocol_features = (GG_FEATURE_STATUS80|GG_FEATURE_DND_FFC); - + glp->async = 1; glp->status = ggp_to_gg_status(status, &glp->status_descr); glp->tls = 0; @@ -1984,7 +1984,7 @@ purple_debug_info("gg", "Trying to retrieve address from gg appmsg service\n"); info->session = gg_login(glp); - purple_connection_update_progress(gc, _("Connecting"), 0, 2); + purple_connection_update_progress(gc, _("Connecting"), 0, 2); if (info->session == NULL) { purple_connection_error_reason (gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, @@ -2131,7 +2131,7 @@ tmp = charset_convert(plain, "UTF-8", "CP1250"); */ tmp = g_strdup_printf("%s", plain); - + if (tmp && (format_length - sizeof(struct gg_msg_richtext))) { if(gg_send_message_richtext(info->session, GG_CLASS_CHAT, ggp_str_to_uin(who), (unsigned char *)tmp, format, format_length) < 0) { ret = -1; diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/gg/lib/common.c --- a/libpurple/protocols/gg/lib/common.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/gg/lib/common.c Tue Jan 04 06:55:30 2011 +0000 @@ -436,7 +436,7 @@ * Zamienia znaki niedrukowalne, spoza ASCII i mające specjalne znaczenie * dla protokołu HTTP na encje postaci \c %XX, gdzie \c XX jest szesnastkową * wartością znaku. - * + * * \param str Ciąg znaków do zakodowania * * \return Zaalokowany bufor lub \c NULL w przypadku błędu. @@ -825,22 +825,22 @@ * \internal Tablica konwersji między CP1250 a UTF-8. */ static const uint16_t table_cp1250[] = { - 0x20ac, '?', 0x201a, '?', 0x201e, 0x2026, 0x2020, 0x2021, - '?', 0x2030, 0x0160, 0x2039, 0x015a, 0x0164, 0x017d, 0x0179, - '?', 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014, - '?', 0x2122, 0x0161, 0x203a, 0x015b, 0x0165, 0x017e, 0x017a, - 0x00a0, 0x02c7, 0x02d8, 0x0141, 0x00a4, 0x0104, 0x00a6, 0x00a7, - 0x00a8, 0x00a9, 0x015e, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x017b, - 0x00b0, 0x00b1, 0x02db, 0x0142, 0x00b4, 0x00b5, 0x00b6, 0x00b7, - 0x00b8, 0x0105, 0x015f, 0x00bb, 0x013d, 0x02dd, 0x013e, 0x017c, - 0x0154, 0x00c1, 0x00c2, 0x0102, 0x00c4, 0x0139, 0x0106, 0x00c7, - 0x010c, 0x00c9, 0x0118, 0x00cb, 0x011a, 0x00cd, 0x00ce, 0x010e, - 0x0110, 0x0143, 0x0147, 0x00d3, 0x00d4, 0x0150, 0x00d6, 0x00d7, - 0x0158, 0x016e, 0x00da, 0x0170, 0x00dc, 0x00dd, 0x0162, 0x00df, - 0x0155, 0x00e1, 0x00e2, 0x0103, 0x00e4, 0x013a, 0x0107, 0x00e7, - 0x010d, 0x00e9, 0x0119, 0x00eb, 0x011b, 0x00ed, 0x00ee, 0x010f, - 0x0111, 0x0144, 0x0148, 0x00f3, 0x00f4, 0x0151, 0x00f6, 0x00f7, - 0x0159, 0x016f, 0x00fa, 0x0171, 0x00fc, 0x00fd, 0x0163, 0x02d9, + 0x20ac, '?', 0x201a, '?', 0x201e, 0x2026, 0x2020, 0x2021, + '?', 0x2030, 0x0160, 0x2039, 0x015a, 0x0164, 0x017d, 0x0179, + '?', 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014, + '?', 0x2122, 0x0161, 0x203a, 0x015b, 0x0165, 0x017e, 0x017a, + 0x00a0, 0x02c7, 0x02d8, 0x0141, 0x00a4, 0x0104, 0x00a6, 0x00a7, + 0x00a8, 0x00a9, 0x015e, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x017b, + 0x00b0, 0x00b1, 0x02db, 0x0142, 0x00b4, 0x00b5, 0x00b6, 0x00b7, + 0x00b8, 0x0105, 0x015f, 0x00bb, 0x013d, 0x02dd, 0x013e, 0x017c, + 0x0154, 0x00c1, 0x00c2, 0x0102, 0x00c4, 0x0139, 0x0106, 0x00c7, + 0x010c, 0x00c9, 0x0118, 0x00cb, 0x011a, 0x00cd, 0x00ce, 0x010e, + 0x0110, 0x0143, 0x0147, 0x00d3, 0x00d4, 0x0150, 0x00d6, 0x00d7, + 0x0158, 0x016e, 0x00da, 0x0170, 0x00dc, 0x00dd, 0x0162, 0x00df, + 0x0155, 0x00e1, 0x00e2, 0x0103, 0x00e4, 0x013a, 0x0107, 0x00e7, + 0x010d, 0x00e9, 0x0119, 0x00eb, 0x011b, 0x00ed, 0x00ee, 0x010f, + 0x0111, 0x0144, 0x0148, 0x00f3, 0x00f4, 0x0151, 0x00f6, 0x00f7, + 0x0159, 0x016f, 0x00fa, 0x0171, 0x00fc, 0x00fd, 0x0163, 0x02d9, }; /** @@ -912,7 +912,7 @@ return 1; } - if (c < 0xc2) + if (c < 0xc2) return -1; if (c < 0xe0) { @@ -922,8 +922,8 @@ return -1; *ch = ((uint16_t) (c & 0x1f) << 6) | (uint16_t) (s[1] ^ 0x80); return 2; - } - + } + if (c < 0xf0) { if (n < 3) return -2; @@ -956,7 +956,7 @@ for (i = 0; i < len; newlen++) { uint16_t discard; int ret; - + ret = gg_utf8_helper(&buf[i], len - i, &discard); if (ret > 0) diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/gg/lib/dcc7.c --- a/libpurple/protocols/gg/lib/dcc7.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/gg/lib/dcc7.c Tue Jan 04 06:55:30 2011 +0000 @@ -4,7 +4,7 @@ * (C) Copyright 2001-2008 Wojtek Kaniewski * Tomasz Chiliński * Adam Wysocki - * + * * Thanks to Jakub Zawadzki * * This program is free software; you can redistribute it and/or modify @@ -210,7 +210,7 @@ } // XXX losować porty? - + if (!port) port = GG_DEFAULT_DCC_PORT; @@ -242,7 +242,7 @@ dcc->fd = fd; dcc->local_port = port; - + dcc->state = GG_STATE_LISTENING; dcc->check = GG_CHECK_READ; dcc->timeout = GG_DCC7_TIMEOUT_FILE_ACK; @@ -264,7 +264,7 @@ gg_debug_dcc(dcc, GG_DEBUG_FUNCTION, "** gg_dcc7_listen_and_send_info(%p)\n", dcc); // XXX dać możliwość konfiguracji? - + dcc->local_addr = dcc->sess->client_addr; if (gg_dcc7_listen(dcc, 0) == -1) @@ -334,7 +334,7 @@ errno = EINVAL; return -1; } - + memset(&pkt, 0, sizeof(pkt)); pkt.type = gg_fix32(type); @@ -595,7 +595,7 @@ if (tmp->state != GG_STATE_REQUESTING_ID || tmp->dcc_type != gg_fix32(p->type)) continue; - + tmp->cid = p->id; switch (tmp->dcc_type) { @@ -654,9 +654,9 @@ e->event.dcc7_error = GG_ERROR_DCC7_HANDSHAKE; return 0; } - + // XXX czy dla odwrotnego połączenia powinniśmy wywołać już zdarzenie GG_DCC7_ACCEPT? - + dcc->offset = gg_fix32(p->offset); dcc->state = GG_STATE_WAITING_FOR_INFO; @@ -685,7 +685,7 @@ gg_debug_session(sess, GG_DEBUG_MISC, "// gg_dcc7_handle_info() unknown dcc session\n"); return 0; } - + if (p->type != GG_DCC7_TYPE_P2P) { gg_debug_session(sess, GG_DEBUG_MISC, "// gg_dcc7_handle_info() unhandled transfer type (%d)\n", p->type); e->type = GG_EVENT_DCC7_ERROR; @@ -722,7 +722,7 @@ dcc->fd = -1; dcc->reverse = 1; } - + if (dcc->type == GG_SESSION_DCC7_SEND) { e->type = GG_EVENT_DCC7_ACCEPT; e->event.dcc7_accept.dcc7 = dcc; @@ -766,7 +766,7 @@ gg_debug_session(sess, GG_DEBUG_MISC, "// gg_dcc7_handle_reject() unknown dcc session\n"); return 0; } - + if (dcc->state != GG_STATE_WAITING_FOR_ACCEPT) { gg_debug_session(sess, GG_DEBUG_MISC, "// gg_dcc7_handle_reject() invalid state\n"); e->type = GG_EVENT_DCC7_ERROR; @@ -806,7 +806,7 @@ gg_debug_session(sess, GG_DEBUG_MISC, "// gg_dcc7_handle_new() not enough memory\n"); return -1; } - + memset(dcc, 0, sizeof(struct gg_dcc7)); dcc->type = GG_SESSION_DCC7_GET; dcc->dcc_type = GG_DCC7_TYPE_FILE; @@ -838,7 +838,7 @@ gg_debug_session(sess, GG_DEBUG_MISC, "// gg_dcc7_handle_packet() not enough memory\n"); return -1; } - + memset(dcc, 0, sizeof(struct gg_dcc7)); dcc->type = GG_SESSION_DCC7_VOICE; @@ -873,7 +873,7 @@ /** * \internal Ustawia odpowiednie stany wewnętrzne w zależności od rodzaju * połączenia. - * + * * \param dcc Struktura połączenia * * \return 0 jeśli się powiodło, -1 w przypadku błędu. diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/gg/lib/events.c --- a/libpurple/protocols/gg/lib/events.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/gg/lib/events.c Tue Jan 04 06:55:30 2011 +0000 @@ -254,7 +254,7 @@ /** * \internal Analizuje informacje rozszerzone wiadomości. - * + * * \param sess Struktura sesji. * \param e Struktura zdarzenia. * \param sender Numer nadawcy. @@ -567,7 +567,7 @@ if (dst != NULL) dst[len] = 0; - + return len; } @@ -893,7 +893,7 @@ e->event.notify60[i].descr = descr; /* XXX czas */ - + length -= sizeof(struct gg_notify_reply77) + descr_len + 1; n = (void*) ((char*) n + sizeof(struct gg_notify_reply77) + descr_len + 1); } else { @@ -1026,7 +1026,7 @@ e->event.notify60[i].descr[descr_len] = 0; /* XXX czas */ - + length -= sizeof(struct gg_notify_reply60) + descr_len + 1; n = (void*) ((char*) n + sizeof(struct gg_notify_reply60) + descr_len + 1); } else { @@ -2077,7 +2077,7 @@ uint32_t tmp_version_len = gg_fix32(strlen(GG8_VERSION)); uint32_t tmp_descr_len = gg_fix32((sess->initial_descr) ? strlen(sess->initial_descr) : 0); - + memset(&l, 0, sizeof(l)); l.uin = gg_fix32(sess->uin); memcpy(l.language, GG8_LANG, sizeof(l.language)); @@ -2090,8 +2090,8 @@ l.dunno2 = 0x64; gg_debug_session(sess, GG_DEBUG_TRAFFIC, "// gg_watch_fd() sending GG_LOGIN80 packet\n"); - ret = gg_send_packet(sess, GG_LOGIN80, - &l, sizeof(l), + ret = gg_send_packet(sess, GG_LOGIN80, + &l, sizeof(l), &tmp_version_len, sizeof(uint32_t), GG8_VERSION, strlen(GG8_VERSION), &tmp_descr_len, sizeof(uint32_t), sess->initial_descr, (sess->initial_descr) ? strlen(sess->initial_descr) : 0, NULL); diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/gg/lib/libgadu.c --- a/libpurple/protocols/gg/lib/libgadu.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/gg/lib/libgadu.c Tue Jan 04 06:55:30 2011 +0000 @@ -112,7 +112,7 @@ /** * Port gniazda nasłuchującego dla połączeń bezpośrednich. - * + * * \ingroup ip */ int gg_dcc_port = 0; @@ -783,9 +783,9 @@ gg_debug(GG_DEBUG_MISC, "// gg_login() not enough memory for status\n"); goto fail; } - + // XXX pamiętać, żeby nie ciąć w środku znaku utf-8 - + if (strlen(sess->initial_descr) > max_length) sess->initial_descr[max_length] = 0; } @@ -1298,7 +1298,7 @@ /** * \internal Dodaje tekst na koniec bufora. - * + * * \param dst Wskaźnik na bufor roboczy * \param pos Wskaźnik na aktualne położenie w buforze roboczym * \param src Dodawany tekst @@ -1420,9 +1420,9 @@ if (dst != NULL) { sprintf(&dst[len], img_fmt, format[format_idx + 9], - format[format_idx + 8], + format[format_idx + 8], format[format_idx + 7], - format[format_idx + 6], + format[format_idx + 6], format[format_idx + 5], format[format_idx + 4], format[format_idx + 3], @@ -1510,7 +1510,7 @@ * \param formatlen Długość informacji o formatowaniu * * \return Numer sekwencyjny wiadomości lub -1 w przypadku błędu. - * + * * \ingroup messages */ int gg_send_message_confer_richtext(struct gg_session *sess, int msgclass, int recipients_count, uin_t *recipients, const unsigned char *message, const unsigned char *format, int formatlen) @@ -1566,7 +1566,7 @@ s.seq = gg_fix32(seq_no); } else { int len; - + // Drobne odchylenie od protokołu. Jeśli wysyłamy kilka // wiadomości w ciągu jednej sekundy, zwiększamy poprzednią // wartość, żeby każda wiadomość miała unikalny numer. diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/gg/lib/pubdir.c --- a/libpurple/protocols/gg/lib/pubdir.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/gg/lib/pubdir.c Tue Jan 04 06:55:30 2011 +0000 @@ -122,10 +122,10 @@ h->callback = gg_pubdir_watch_fd; h->destroy = gg_pubdir_free; - + if (!async) gg_pubdir_watch_fd(h); - + return h; } @@ -193,7 +193,7 @@ errno = EFAULT; return NULL; } - + __pwd = gg_saprintf("%ld", random()); __fmpwd = gg_urlencode(password); __tokenid = gg_urlencode(tokenid); @@ -251,10 +251,10 @@ h->callback = gg_pubdir_watch_fd; h->destroy = gg_pubdir_free; - + if (!async) gg_pubdir_watch_fd(h); - + return h; } @@ -324,7 +324,7 @@ errno = EFAULT; return NULL; } - + __fmpwd = gg_urlencode(passwd); __pwd = gg_urlencode(newpasswd); __email = gg_urlencode(email); @@ -340,7 +340,7 @@ free(__tokenval); return NULL; } - + if (!(form = gg_saprintf("fmnumber=%d&fmpwd=%s&pwd=%s&email=%s&tokenid=%s&tokenval=%s&code=%u", uin, __fmpwd, __pwd, __email, __tokenid, __tokenval, gg_http_hash("ss", email, newpasswd)))) { gg_debug(GG_DEBUG_MISC, "=> change, not enough memory for form fields\n"); free(__fmpwd); @@ -351,13 +351,13 @@ return NULL; } - + free(__fmpwd); free(__pwd); free(__email); free(__tokenid); free(__tokenval); - + gg_debug(GG_DEBUG_MISC, "=> change, %s\n", form); query = gg_saprintf( @@ -460,7 +460,7 @@ errno = EFAULT; return NULL; } - + __tokenid = gg_urlencode(tokenid); __tokenval = gg_urlencode(tokenval); __email = gg_urlencode(email); @@ -484,7 +484,7 @@ free(__tokenid); free(__tokenval); free(__email); - + gg_debug(GG_DEBUG_MISC, "=> remind, %s\n", form); query = gg_saprintf( @@ -588,7 +588,7 @@ errno = EINVAL; return -1; } - + if (h->state != GG_STATE_PARSING) { if (gg_http_watch_fd(h) == -1) { gg_debug(GG_DEBUG_MISC, "=> pubdir, http failure\n"); @@ -599,9 +599,9 @@ if (h->state != GG_STATE_PARSING) return 0; - + h->state = GG_STATE_DONE; - + if (!(h->data = p = malloc(sizeof(struct gg_pubdir)))) { gg_debug(GG_DEBUG_MISC, "=> pubdir, not enough memory for results\n"); return -1; @@ -609,7 +609,7 @@ p->success = 0; p->uin = 0; - + gg_debug(GG_DEBUG_MISC, "=> pubdir, let's parse \"%s\"\n", h->body); if ((tmp = strstr(h->body, "Tokens okregisterreply_packet.reg.dwUserId="))) { @@ -636,7 +636,7 @@ { if (!h) return; - + free(h->data); gg_http_free(h); } @@ -674,10 +674,10 @@ h->callback = gg_token_watch_fd; h->destroy = gg_token_free; - + if (!async) gg_token_watch_fd(h); - + return h; } @@ -706,7 +706,7 @@ errno = EINVAL; return -1; } - + if (h->state != GG_STATE_PARSING) { if (gg_http_watch_fd(h) == -1) { gg_debug(GG_DEBUG_MISC, "=> token, http failure\n"); @@ -717,7 +717,7 @@ if (h->state != GG_STATE_PARSING) return 0; - + /* jeśli h->data jest puste, to ściągaliśmy tokenid i url do niego, * ale jeśli coś tam jest, to znaczy, że mamy drugi etap polegający * na pobieraniu tokenu. */ @@ -735,7 +735,7 @@ free(url); return -1; } - + if (!h->body || sscanf(h->body, "%d %d %d\r\n%s\r\n%s", &width, &height, &length, tokenid, url) != 5) { gg_debug(GG_DEBUG_MISC, "=> token, parsing failed\n"); free(url); @@ -743,7 +743,7 @@ errno = EINVAL; return -1; } - + /* dostaliśmy tokenid i wszystkie niezbędne informacje, * więc pobierzmy obrazek z tokenem */ @@ -779,7 +779,7 @@ free(url); free(tokenid); return -1; - } + } if (!(h2 = gg_http_connect(host, GG_REGISTER_PORT, h->async, "GET", path, headers))) { gg_debug(GG_DEBUG_MISC, "=> token, gg_http_connect() failed mysteriously\n"); @@ -803,7 +803,7 @@ h->callback = gg_token_watch_fd; h->destroy = gg_token_free; - + if (!h->async) gg_token_watch_fd(h); @@ -821,7 +821,7 @@ /* obrazek mamy w h->body */ h->state = GG_STATE_DONE; } - + return 0; } @@ -841,7 +841,7 @@ if ((t = h->data)) free(t->tokenid); - + free(h->data); gg_http_free(h); } diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/gg/lib/pubdir50.c --- a/libpurple/protocols/gg/lib/pubdir50.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/gg/lib/pubdir50.c Tue Jan 04 06:55:30 2011 +0000 @@ -92,7 +92,7 @@ return 0; } - + if (!(dupfield = strdup(field))) { gg_debug(GG_DEBUG_MISC, "// gg_pubdir50_add_n() out of memory\n"); free(dupvalue); @@ -147,7 +147,7 @@ int gg_pubdir50_seq_set(gg_pubdir50_t req, uint32_t seq) { gg_debug(GG_DEBUG_FUNCTION, "** gg_pubdir50_seq_set(%p, %d);\n", req, seq); - + if (!req) { gg_debug(GG_DEBUG_MISC, "// gg_pubdir50_seq_set() invalid arguments\n"); errno = EFAULT; @@ -172,7 +172,7 @@ if (!s) return; - + for (i = 0; i < s->entries_count; i++) { free(s->entries[i].field); free(s->entries[i].value); @@ -200,7 +200,7 @@ struct gg_pubdir50_request *r; gg_debug_session(sess, GG_DEBUG_FUNCTION, "** gg_pubdir50(%p, %p);\n", sess, req); - + if (!sess || !req) { gg_debug_session(sess, GG_DEBUG_MISC, "// gg_pubdir50() invalid arguments\n"); errno = EFAULT; @@ -217,7 +217,7 @@ /* wyszukiwanie bierze tylko pierwszy wpis */ if (req->entries[i].num) continue; - + if (sess->encoding == GG_ENCODING_CP1250) { size += strlen(req->entries[i].field) + 1; size += strlen(req->entries[i].value) + 1; @@ -320,7 +320,7 @@ struct gg_pubdir50_reply *r = (struct gg_pubdir50_reply*) packet; gg_pubdir50_t res; int num = 0; - + gg_debug(GG_DEBUG_FUNCTION, "** gg_pubdir50_handle_reply_sess(%p, %p, %p, %d);\n", sess, e, packet, length); if (!sess || !e || !packet) { @@ -377,7 +377,7 @@ } value = NULL; - + for (p = field; p < end; p++) { /* jeśli mamy koniec tekstu... */ if (!*p) { @@ -392,7 +392,7 @@ break; } } - + /* sprawdźmy, czy pole nie wychodzi poza pakiet, żeby nie * mieć segfaultów, jeśli serwer przestanie zakańczać pakietów * przez \0 */ @@ -429,10 +429,10 @@ free(tmp); } } - } + } res->count = num + 1; - + return 0; failure: diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/gg/lib/resolver.c --- a/libpurple/protocols/gg/lib/resolver.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/gg/lib/resolver.c Tue Jan 04 06:55:30 2011 +0000 @@ -356,17 +356,17 @@ struct in_addr a; gg_debug(GG_DEBUG_MISC, "// gg_resolve_win32thread_thread() host: %s, fd: %i called\n", d->hostname, d->fd); - + if ((a.s_addr = inet_addr(d->hostname)) == INADDR_NONE) { /* W przypadku błędu gg_gethostbyname_real() zwróci -1 * i nie zmieni &addr. Tam jest już INADDR_NONE, * więc nie musimy robić nic więcej. */ gg_gethostbyname_real(d->hostname, &a, 0); } - + // if ((a.s_addr = inet_addr(d->hostname)) == INADDR_NONE) { // struct in_addr *hn; - + // if (!(hn = gg_gethostbyname(d->hostname))) // a.s_addr = INADDR_NONE; // else { @@ -384,7 +384,7 @@ free(d); gg_debug(GG_DEBUG_MISC, "// gg_resolve_win32thread_thread() done\n"); - + return 0; } @@ -397,7 +397,7 @@ int pipes[2], new_errno; gg_debug(GG_DEBUG_FUNCTION, "** gg_resolve_win32thread(%p, %p, \"%s\");\n", fd, resolver, hostname); - + if (!resolver || !fd || !hostname) { gg_debug(GG_DEBUG_MISC, "// gg_resolve_win32thread() invalid arguments\n"); errno = EFAULT; @@ -438,7 +438,7 @@ *fd = pipes[0]; gg_debug(GG_DEBUG_MISC, "// gg_resolve_win32thread() done\n"); - + return 0; cleanup: @@ -461,7 +461,7 @@ struct gg_resolve_win32thread_data *data; gg_debug(GG_DEBUG_MISC, "// gg_resolve_win32thread_cleanup() force: %i called\n", force); - + if (priv_data == NULL || *priv_data == NULL) gg_debug(GG_DEBUG_MISC, "// gg_resolve_win32thread_cleanup() priv_data: NULL\n"); return; @@ -494,7 +494,7 @@ * * Połączenia asynchroniczne nie mogą blokować procesu w trakcie rozwiązywania * nazwy serwera. W tym celu tworzony jest potok, nowy proces i dopiero w nim - * przeprowadzane jest rozwiązywanie nazwy. Deskryptor strony do odczytu + * przeprowadzane jest rozwiązywanie nazwy. Deskryptor strony do odczytu * zapisuje się w strukturze sieci i czeka na dane w postaci struktury * \c in_addr. Jeśli nie znaleziono nazwy, zwracana jest \c INADDR_NONE. * @@ -673,7 +673,7 @@ if (write(data->wfd, &addr, sizeof(addr)) == sizeof(addr)) pthread_exit(NULL); - else + else pthread_exit((void*) -1); return NULL; /* żeby kompilator nie marudził */ @@ -989,15 +989,15 @@ gg_global_resolver_cleanup = gg_resolver_fork_cleanup; return 0; #endif - + #ifdef _WIN32 case GG_RESOLVER_WIN32: gg_global_resolver_type = type; gg_global_resolver_start = gg_resolve_win32thread; gg_global_resolver_cleanup = gg_resolve_win32thread_cleanup; return 0; -#endif - +#endif + #ifdef GG_CONFIG_HAVE_PTHREAD case GG_RESOLVER_PTHREAD: gg_global_resolver_type = type; @@ -1038,7 +1038,7 @@ * - \c "int force" — flaga mówiąca o tym, że zasoby są zwalniane przed zakończeniem rozwiązywania nazwy, np. z powodu zamknięcia sesji. * * Własny kod rozwiązywania nazwy powinien stworzyć potok, parę gniazd lub - * inny deskryptor pozwalający na co najmniej jednostronną komunikację i + * inny deskryptor pozwalający na co najmniej jednostronną komunikację i * przekazać go w parametrze \c fd. Po zakończeniu rozwiązywania nazwy, * powinien wysłać otrzymany adres IP w postaci sieciowej (big-endian) do * deskryptora. Jeśli rozwiązywanie nazwy się nie powiedzie, należy wysłać diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/gg/lib/sha1.c --- a/libpurple/protocols/gg/lib/sha1.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/gg/lib/sha1.c Tue Jan 04 06:55:30 2011 +0000 @@ -228,12 +228,12 @@ void gg_login_hash_sha1(const char *password, uint32_t seed, uint8_t *result) { SHA_CTX ctx; - + SHA1_Init(&ctx); SHA1_Update(&ctx, (const unsigned char*) password, strlen(password)); seed = gg_fix32(seed); SHA1_Update(&ctx, (uint8_t*) &seed, 4); - + SHA1_Final(result, &ctx); } diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/irc/cmds.c --- a/libpurple/protocols/irc/cmds.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/irc/cmds.c Tue Jan 04 06:55:30 2011 +0000 @@ -73,7 +73,7 @@ /* we have defined args as args[0] is target and args[1] is ctcp command */ char *buf; GString *string; - + /* check if we have args */ if (!args || !args[0] || !args[1]) return 0; @@ -89,7 +89,7 @@ irc_send(irc, buf); g_free(buf); - + return 1; } @@ -600,7 +600,7 @@ return 0; buf = irc_format(irc, "vn", "WHOWAS", args[0]); - + irc->whois.nick = g_strdup(args[0]); irc_send(irc, buf); g_free(buf); diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/irc/dcc_send.c --- a/libpurple/protocols/irc/dcc_send.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/irc/dcc_send.c Tue Jan 04 06:55:30 2011 +0000 @@ -129,14 +129,14 @@ purple_debug(PURPLE_DEBUG_INFO, "irc", "Receiving file (%s) from %s\n", filename->str, xd->ip); purple_xfer_set_size(xfer, token[i+2] ? atoi(token[i+2]) : 0); - + purple_xfer_set_init_fnc(xfer, irc_dccsend_recv_init); purple_xfer_set_ack_fnc(xfer, irc_dccsend_recv_ack); - + purple_xfer_set_end_fnc(xfer, irc_dccsend_recv_destroy); purple_xfer_set_request_denied_fnc(xfer, irc_dccsend_recv_destroy); purple_xfer_set_cancel_recv_fnc(xfer, irc_dccsend_recv_destroy); - + purple_xfer_request(xfer); } g_strfreev(token); diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/irc/msgs.c --- a/libpurple/protocols/irc/msgs.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/irc/msgs.c Tue Jan 04 06:55:30 2011 +0000 @@ -334,12 +334,12 @@ PurpleNotifyUserInfo *user_info; if (!irc->whois.nick) { - purple_debug(PURPLE_DEBUG_WARNING, "irc", "Unexpected End of %s for %s\n", !strcmp(name, "369") ? "WHOWAS" : "WHOIS" + purple_debug(PURPLE_DEBUG_WARNING, "irc", "Unexpected End of %s for %s\n", !strcmp(name, "369") ? "WHOWAS" : "WHOIS" , args[1]); return; } if (purple_utf8_strcasecmp(irc->whois.nick, args[1])) { - purple_debug(PURPLE_DEBUG_WARNING, "irc", "Received end of %s for %s, expecting %s\n", !strcmp(name, "369") ? "WHOWAS" : "WHOIS" + purple_debug(PURPLE_DEBUG_WARNING, "irc", "Received end of %s for %s, expecting %s\n", !strcmp(name, "369") ? "WHOWAS" : "WHOIS" , args[1], irc->whois.nick); return; } @@ -610,10 +610,10 @@ } else if (!strcmp(name, "422")) { /* in case there is no 251, and no MOTD set, finalize the connection. * (and clear the motd for good measure). */ - + if (irc->motd) g_string_free(irc->motd, TRUE); - + irc_connected(irc, args[0]); return; } diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/irc/parse.c --- a/libpurple/protocols/irc/parse.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/irc/parse.c Tue Jan 04 06:55:30 2011 +0000 @@ -657,7 +657,7 @@ * instead of a null terminated string. */ purple_signal_emit(_irc_plugin, "irc-receiving-text", gc, &input); - + if (!strncmp(input, "PING ", 5)) { msg = irc_format(irc, "vv", "PONG", input + 5); irc_send(irc, msg); diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/jabber/buddy.c --- a/libpurple/protocols/jabber/buddy.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/jabber/buddy.c Tue Jan 04 06:55:30 2011 +0000 @@ -2305,17 +2305,17 @@ const gchar *category) { const GList *iter = NULL; - + if (jbr->caps.info) { for (iter = jbr->caps.info->identities ; iter ; iter = g_list_next(iter)) { - const JabberIdentity *identity = + const JabberIdentity *identity = (JabberIdentity *) iter->data; - + if (strcmp(identity->category, category) == 0) { return identity->type; } } } - + return NULL; } diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/jabber/caps.c --- a/libpurple/protocols/jabber/caps.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/jabber/caps.c Tue Jan 04 06:55:30 2011 +0000 @@ -803,7 +803,7 @@ return fields; } -static void +static void append_escaped_string(PurpleCipherContext *context, const gchar *str) { if (str && *str) { diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/jabber/data.c --- a/libpurple/protocols/jabber/data.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/jabber/data.c Tue Jan 04 06:55:30 2011 +0000 @@ -283,7 +283,7 @@ gchar *alt = request_data->alt; gboolean ephemeral = request_data->ephemeral; JabberDataRequestCallback *cb = request_data->cb; - + xmlnode *data_element = xmlnode_get_child(packet, "data"); xmlnode *item_not_found = xmlnode_get_child(packet, "item-not-found"); @@ -308,7 +308,7 @@ } void -jabber_data_request(JabberStream *js, const gchar *cid, const gchar *who, +jabber_data_request(JabberStream *js, const gchar *cid, const gchar *who, gchar *alt, gboolean ephemeral, JabberDataRequestCallback cb, gpointer userdata) { @@ -328,7 +328,7 @@ data->alt = alt; data->ephemeral = ephemeral; data->cb = cb; - + xmlnode_set_attrib(request->node, "to", who); jabber_iq_set_callback(request, jabber_data_request_cb, data); xmlnode_insert_child(request->node, data_request); @@ -398,7 +398,7 @@ purple_debug_info("jabber", "associating remote BoB object with cid = %s\n", cid); - + g_hash_table_insert(remote_data_by_cid, cid, data); } diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/jabber/disco.c --- a/libpurple/protocols/jabber/disco.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/jabber/disco.c Tue Jan 04 06:55:30 2011 +0000 @@ -480,10 +480,10 @@ js->srv_query_data = NULL; if (results > 0) { - purple_debug_info("jabber", "looking up IP for %s:%d\n", + purple_debug_info("jabber", "looking up IP for %s:%d\n", resp[0].hostname, resp[0].port); - js->stun_query = - purple_dnsquery_a(resp[0].hostname, resp[0].port, + js->stun_query = + purple_dnsquery_a(resp[0].hostname, resp[0].port, jabber_disco_stun_lookup_cb, js); } } @@ -547,7 +547,7 @@ } } else if (purple_network_get_stun_ip() == NULL || purple_strequal(purple_network_get_stun_ip(), "")) { - js->srv_query_data = + js->srv_query_data = purple_srv_resolve("stun", "udp", js->user->domain, jabber_disco_stun_srv_resolve_cb, js); /* TODO: add TURN support later... */ diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/jabber/google/google.c --- a/libpurple/protocols/jabber/google/google.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/jabber/google/google.c Tue Jan 04 06:55:30 2011 +0000 @@ -159,7 +159,7 @@ g_return_if_fail(gc != NULL); js = purple_connection_get_protocol_data(gc); - room = g_strdup_printf("private-chat-%s", uuid); + room = g_strdup_printf("private-chat-%s", uuid); chat = jabber_join_chat(js, room, GOOGLE_GROUPCHAT_SERVER, js->user->node, NULL, NULL); if (chat) { diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/jabber/google/google_session.c --- a/libpurple/protocols/jabber/google/google_session.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/jabber/google/google_session.c Tue Jan 04 06:55:30 2011 +0000 @@ -62,7 +62,7 @@ if (session->description) xmlnode_free(session->description); - + g_free(session->session_data); g_free(session); } @@ -427,7 +427,7 @@ session->remote_jid = jid; session_data = g_new0(GoogleAVSessionData, 1); session->session_data = session_data; - + if (type & PURPLE_MEDIA_VIDEO) session_data->video = TRUE; @@ -440,7 +440,7 @@ jabber_google_relay_response_session_initiate_cb(session, NULL, 0, 0, 0, NULL, NULL); } - + /* we don't actually know yet wether it succeeded... maybe this is very wrong... */ return TRUE; @@ -464,7 +464,7 @@ (GoogleAVSessionData *) session->session_data; params = - jabber_google_session_get_params(js, relay_ip, relay_udp, relay_tcp, + jabber_google_session_get_params(js, relay_ip, relay_udp, relay_tcp, relay_ssltcp, relay_username, relay_password, &num_params); if (purple_media_add_stream(session_data->media, "google-voice", @@ -483,20 +483,20 @@ if (session_data->remote_audio_candidates) { purple_media_add_remote_candidates(session_data->media, - "google-voice", session->remote_jid, + "google-voice", session->remote_jid, session_data->remote_audio_candidates); purple_media_candidate_list_free(session_data->remote_audio_candidates); session_data->remote_audio_candidates = NULL; } if (session_data->remote_video_candidates) { purple_media_add_remote_candidates(session_data->media, - "google-video", session->remote_jid, + "google-video", session->remote_jid, session_data->remote_video_candidates); purple_media_candidate_list_free(session_data->remote_video_candidates); session_data->remote_video_candidates = NULL; } } - + g_free(params); for (codec_element = xmlnode_get_child(session->description, "payload-type"); @@ -561,7 +561,7 @@ const gchar *xmlns; GoogleAVSessionData *session_data = (GoogleAVSessionData *) session->session_data; - + if (session->state != UNINIT) { purple_debug_error("jabber", "Received initiate for active session.\n"); return FALSE; @@ -598,9 +598,9 @@ G_CALLBACK(google_session_stream_info_cb), session); session->iq_id = g_strdup(iq_id); - + if (js->google_relay_host && js->google_relay_token) { - jabber_google_do_relay_request(js, session, + jabber_google_do_relay_request(js, session, jabber_google_relay_response_session_handle_initiate_cb); } else { jabber_google_relay_response_session_handle_initiate_cb(session, NULL, @@ -621,7 +621,7 @@ char n[4]; GoogleAVSessionData *session_data = (GoogleAVSessionData *) session->session_data; - + for (cand = xmlnode_get_child(sess, "candidate"); cand; cand = xmlnode_get_next_twin(cand)) { PurpleMediaCandidate *info; @@ -636,9 +636,9 @@ if (cname && type && address && port) { PurpleMediaCandidateType candidate_type; guint prio = preference ? g_ascii_strtod(preference, NULL) * 1000 : 0; - + g_snprintf(n, sizeof(n), "S%d", name++); - + if (g_str_equal(type, "local")) candidate_type = PURPLE_MEDIA_CANDIDATE_TYPE_HOST; else if (g_str_equal(type, "stun")) @@ -713,7 +713,7 @@ gboolean video = (xmlns && !strcmp(xmlns, NS_GOOGLE_SESSION_VIDEO)); GoogleAVSessionData *session_data = (GoogleAVSessionData *) session->session_data; - + for (; codec_element; codec_element = codec_element->next) { const gchar *xmlns, *encoding_name, *id, *clock_rate, *width, *height, *framerate; diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/jabber/google/jingleinfo.c --- a/libpurple/protocols/jabber/google/jingleinfo.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/jabber/google/jingleinfo.c Tue Jan 04 06:55:30 2011 +0000 @@ -124,7 +124,7 @@ if (relay) { xmlnode *token = xmlnode_get_child(relay, "token"); xmlnode *server = xmlnode_get_child(relay, "server"); - + if (token) { gchar *relay_token = xmlnode_get_data(token); @@ -133,7 +133,7 @@ } if (server) { - js->google_relay_host = + js->google_relay_host = g_strdup(xmlnode_get_attrib(server, "host")); } } diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/jabber/google/relay.c --- a/libpurple/protocols/jabber/google/relay.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/jabber/google/relay.c Tue Jan 04 06:55:30 2011 +0000 @@ -38,7 +38,7 @@ for (; lines[i] ; i++) { gchar *line = lines[i]; gchar **parts = g_strsplit(line, "=", 2); - + if (parts[0] && parts[1]) { if (purple_strequal(parts[0], "relay.ip")) { *ip = g_strdup(parts[1]); @@ -61,7 +61,7 @@ } static void -jabber_google_relay_remove_url_data(JabberStream *js, +jabber_google_relay_remove_url_data(JabberStream *js, PurpleUtilFetchUrlData *url_data) { GList *iter = js->google_relay_requests; @@ -76,8 +76,8 @@ } static void -jabber_google_relay_fetch_cb(PurpleUtilFetchUrlData *url_data, - gpointer user_data, const gchar *url_text, gsize len, +jabber_google_relay_fetch_cb(PurpleUtilFetchUrlData *url_data, + gpointer user_data, const gchar *url_text, gsize len, const gchar *error_message) { JabberGoogleRelayCallbackData *data = @@ -93,7 +93,7 @@ gchar *relay_password = NULL; g_free(data); - + if (url_data) { jabber_google_relay_remove_url_data(js, url_data); } @@ -128,15 +128,15 @@ g_strdup_printf("GET /create_session HTTP/1.0\r\n" "Host: %s\r\n" "X-Talk-Google-Relay-Auth: %s\r\n" - "X-Google-Relay-Auth: %s\r\n\r\n", + "X-Google-Relay-Auth: %s\r\n\r\n", js->google_relay_host, js->google_relay_token, js->google_relay_token); JabberGoogleRelayCallbackData *data = g_new0(JabberGoogleRelayCallbackData, 1); data->session = session; data->cb = cb; - purple_debug_info("jabber", - "sending Google relay request %s to %s\n", request, url); - url_data = + purple_debug_info("jabber", + "sending Google relay request %s to %s\n", request, url); + url_data = purple_util_fetch_url_request(url, FALSE, NULL, FALSE, request, FALSE, jabber_google_relay_fetch_cb, data); if (url_data) { diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/jabber/jabber.c --- a/libpurple/protocols/jabber/jabber.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/jabber/jabber.c Tue Jan 04 06:55:30 2011 +0000 @@ -240,7 +240,7 @@ jabber_send_raw(js, "", -1); return TRUE; - } else { + } else { purple_debug_warning("jabber", "No libpurple TLS/SSL support found."); } #endif @@ -1717,8 +1717,8 @@ (PurpleUtilFetchUrlData *) js->google_relay_requests->data; purple_util_fetch_url_cancel(url_data); g_free(url_data); - js->google_relay_requests = - g_list_delete_link(js->google_relay_requests, + js->google_relay_requests = + g_list_delete_link(js->google_relay_requests, js->google_relay_requests); } } @@ -2145,9 +2145,9 @@ if (jb) { JabberBuddyResource *jbr = jabber_buddy_find_resource(jb, NULL); if (jbr) { - const gchar *client_type = + const gchar *client_type = jabber_resource_get_identity_category_type(jbr, "client"); - + if (client_type) { if (strcmp(client_type, "phone") == 0) { return "mobile"; @@ -2162,7 +2162,7 @@ } } } - + return NULL; } @@ -2312,7 +2312,7 @@ purple_notify_user_info_add_pair(user_info, _("Mood"), moodplustext); g_free(moodplustext); } else - purple_notify_user_info_add_pair(user_info, _("Mood"), + purple_notify_user_info_add_pair(user_info, _("Mood"), description ? _(description) : mood); } if (purple_presence_is_status_primitive_active(presence, PURPLE_STATUS_TUNE)) { @@ -2376,7 +2376,7 @@ NULL); types = g_list_prepend(types, type); - + type = purple_status_type_new_with_attrs(PURPLE_STATUS_MOOD, "mood", NULL, TRUE, TRUE, TRUE, PURPLE_MOOD_NAME, _("Mood Name"), purple_value_new(PURPLE_TYPE_STRING), @@ -3138,7 +3138,7 @@ gchar *description; PurpleBuddy *buddy; const char *alias; - PurpleAttentionType *attn = + PurpleAttentionType *attn = purple_get_attention_type_from_code(conv->account, 0); if (!args || !args[0]) { @@ -3157,10 +3157,10 @@ alias = purple_buddy_get_contact_alias(buddy); else alias = who; - - description = + + description = g_strdup_printf(purple_attention_type_get_outgoing_desc(attn), alias); - purple_conversation_write(conv, NULL, description, + purple_conversation_write(conv, NULL, description, PURPLE_MESSAGE_NOTIFY | PURPLE_MESSAGE_SYSTEM, time(NULL)); g_free(description); return _jabber_send_buzz(js, who, error) ? PURPLE_CMD_RET_OK : PURPLE_CMD_RET_FAILED; @@ -3518,7 +3518,7 @@ } if (has_resources_without_caps) { - /* there is at least one resource which we don't have caps for, + /* there is at least one resource which we don't have caps for, let's assume they can receive files... */ return TRUE; } else { diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/jabber/jingle/content.c --- a/libpurple/protocols/jabber/jingle/content.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/jabber/jingle/content.c Tue Jan 04 06:55:30 2011 +0000 @@ -93,7 +93,7 @@ { GObjectClass *gobject_class = (GObjectClass*)klass; parent_class = g_type_class_peek_parent(klass); - + gobject_class->finalize = jingle_content_finalize; gobject_class->set_property = jingle_content_set_property; gobject_class->get_property = jingle_content_get_property; @@ -164,7 +164,7 @@ { JingleContentPrivate *priv = JINGLE_CONTENT_GET_PRIVATE(content); purple_debug_info("jingle","jingle_content_finalize\n"); - + g_free(priv->description_type); g_free(priv->creator); g_free(priv->disposition); @@ -215,7 +215,7 @@ g_object_unref(content->priv->pending_transport); content->priv->pending_transport = g_value_get_object(value); break; - default: + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; } @@ -226,7 +226,7 @@ { JingleContent *content; g_return_if_fail(JINGLE_IS_CONTENT(object)); - + content = JINGLE_CONTENT(object); switch (prop_id) { @@ -251,8 +251,8 @@ case PROP_PENDING_TRANSPORT: g_value_set_object(value, content->priv->pending_transport); break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; } } @@ -262,7 +262,7 @@ const gchar *disposition, const gchar *name, const gchar *senders, JingleTransport *transport) { - + JingleContent *content = g_object_new(jingle_get_type(type), "creator", creator, diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/jabber/jingle/iceudp.c --- a/libpurple/protocols/jabber/jingle/iceudp.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/jabber/jingle/iceudp.c Tue Jan 04 06:55:30 2011 +0000 @@ -215,7 +215,7 @@ iceudp->priv->remote_candidates = g_value_get_pointer(value); break; - default: + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; } @@ -226,7 +226,7 @@ { JingleIceUdp *iceudp; g_return_if_fail(JINGLE_IS_ICEUDP(object)); - + iceudp = JINGLE_ICEUDP(object); switch (prop_id) { @@ -236,8 +236,8 @@ case PROP_REMOTE_CANDIDATES: g_value_set_pointer(value, iceudp->priv->remote_candidates); break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; } } diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/jabber/jingle/jingle.c --- a/libpurple/protocols/jabber/jingle/jingle.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/jabber/jingle/jingle.c Tue Jan 04 06:55:30 2011 +0000 @@ -170,7 +170,7 @@ jabber_iq_send(jingle_session_create_ack(session, jingle)); jingle_session_accept_session(session); - + for (; content; content = xmlnode_get_next_twin(content)) { const gchar *name = xmlnode_get_attrib(content, "name"); const gchar *creator = xmlnode_get_attrib(content, "creator"); @@ -201,7 +201,7 @@ jabber_iq_send(jingle_session_create_ack(session, jingle)); jingle_session_accept_session(session); - + for (; content; content = xmlnode_get_next_twin(content)) { const gchar *name = xmlnode_get_attrib(content, "name"); const gchar *creator = xmlnode_get_attrib(content, "creator"); @@ -263,7 +263,7 @@ xmlnode *content = xmlnode_get_child(jingle, "content"); jabber_iq_send(jingle_session_create_ack(session, jingle)); - + for (; content; content = xmlnode_get_next_twin(content)) { const gchar *name = xmlnode_get_attrib(content, "name"); const gchar *creator = xmlnode_get_attrib(content, "creator"); @@ -282,7 +282,7 @@ for (; content; content = xmlnode_get_next_twin(content)) { const gchar *name = xmlnode_get_attrib(content, "name"); const gchar *creator = xmlnode_get_attrib(content, "creator"); - JingleContent *parsed_content = + JingleContent *parsed_content = jingle_session_find_content(session, name, creator); if (parsed_content == NULL) { purple_debug_error("jingle", "Error parsing content\n"); @@ -301,7 +301,7 @@ xmlnode *content = xmlnode_get_child(jingle, "content"); jabber_iq_send(jingle_session_create_ack(session, jingle)); - + for (; content; content = xmlnode_get_next_twin(content)) { const gchar *name = xmlnode_get_attrib(content, "name"); const gchar *creator = xmlnode_get_attrib(content, "creator"); @@ -447,13 +447,13 @@ { GValue value; GstStructure *turn_setup = gst_structure_new("relay-info", - "ip", G_TYPE_STRING, ip, + "ip", G_TYPE_STRING, ip, "port", G_TYPE_UINT, port, "username", G_TYPE_STRING, username, "password", G_TYPE_STRING, password, "relay-type", G_TYPE_STRING, relay_type, NULL); - purple_debug_info("jabber", "created gst_structure %" GST_PTR_FORMAT "\n", + purple_debug_info("jabber", "created gst_structure %" GST_PTR_FORMAT "\n", turn_setup); if (turn_setup) { memset(&value, 0, sizeof(GValue)); @@ -477,18 +477,18 @@ (relay_ip ? 3 : 2) : (relay_ip ? 1 : 0); GParameter *params = NULL; int next_index = 0; - + if (num_params > 0) { params = g_new0(GParameter, num_params); if (has_account_stun) { - purple_debug_info("jabber", + purple_debug_info("jabber", "setting param stun-ip for stream using Google auto-config: %s\n", js->stun_ip); params[next_index].name = "stun-ip"; g_value_init(¶ms[next_index].value, G_TYPE_STRING); g_value_set_string(¶ms[next_index].value, js->stun_ip); - purple_debug_info("jabber", + purple_debug_info("jabber", "setting param stun-port for stream using Google auto-config: %d\n", js->stun_port); next_index++; @@ -497,22 +497,22 @@ g_value_set_uint(¶ms[next_index].value, js->stun_port); next_index++; } - + if (relay_ip) { GValueArray *relay_info = g_value_array_new(0); if (relay_udp) { - relay_info = + relay_info = jingle_create_relay_info(relay_ip, relay_udp, relay_username, relay_password, "udp", relay_info); } if (relay_tcp) { - relay_info = + relay_info = jingle_create_relay_info(relay_ip, relay_tcp, relay_username, relay_password, "tcp", relay_info); } if (relay_ssltcp) { - relay_info = + relay_info = jingle_create_relay_info(relay_ip, relay_ssltcp, relay_username, relay_password, "tls", relay_info); } diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/jabber/jingle/rawudp.c --- a/libpurple/protocols/jabber/jingle/rawudp.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/jabber/jingle/rawudp.c Tue Jan 04 06:55:30 2011 +0000 @@ -187,7 +187,7 @@ rawudp->priv->remote_candidates = g_value_get_pointer(value); break; - default: + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; } @@ -198,7 +198,7 @@ { JingleRawUdp *rawudp; g_return_if_fail(JINGLE_IS_RAWUDP(object)); - + rawudp = JINGLE_RAWUDP(object); switch (prop_id) { @@ -208,8 +208,8 @@ case PROP_REMOTE_CANDIDATES: g_value_set_pointer(value, rawudp->priv->remote_candidates); break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; } } diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/jabber/jingle/rtp.c --- a/libpurple/protocols/jabber/jingle/rtp.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/jabber/jingle/rtp.c Tue Jan 04 06:55:30 2011 +0000 @@ -160,7 +160,7 @@ g_free(rtp->priv->ssrc); rtp->priv->ssrc = g_value_dup_string(value); break; - default: + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; } @@ -171,7 +171,7 @@ { JingleRtp *rtp; g_return_if_fail(JINGLE_IS_RTP(object)); - + rtp = JINGLE_RTP(object); switch (prop_id) { @@ -181,8 +181,8 @@ case PROP_SSRC: g_value_set_string(value, rtp->priv->ssrc); break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; } } @@ -251,7 +251,7 @@ gchar *password = purple_media_candidate_get_password(candidate); PurpleMediaCandidateType type = purple_media_candidate_get_candidate_type(candidate); - + JingleIceUdpCandidate *iceudp_candidate = jingle_iceudp_candidate_new( purple_media_candidate_get_component_id(candidate), purple_media_candidate_get_foundation(candidate), @@ -531,7 +531,7 @@ gchar *remote_jid = jingle_session_get_remote_jid(session); PurpleMedia *media = purple_media_manager_create_media( - purple_media_manager_get(), + purple_media_manager_get(), purple_connection_get_account(js->gc), "fsrtpconference", remote_jid, jingle_session_is_initiator(session)); @@ -610,7 +610,7 @@ type = is_audio == TRUE ? PURPLE_MEDIA_RECV_AUDIO : PURPLE_MEDIA_RECV_VIDEO; - params = + params = jingle_get_params(jingle_session_get_js(session), NULL, 0, 0, 0, NULL, NULL, &num_params); @@ -659,8 +659,8 @@ id = xmlnode_get_attrib(codec_element, "id"); clock_rate = xmlnode_get_attrib(codec_element, "clockrate"); - codec = purple_media_codec_new(atoi(id), encoding_name, - type, + codec = purple_media_codec_new(atoi(id), encoding_name, + type, clock_rate ? atoi(clock_rate) : 0); for (param = xmlnode_get_child(codec_element, "parameter"); @@ -702,7 +702,7 @@ gchar *id, *name, *clockrate, *channels; gchar *codec_str; xmlnode *payload = xmlnode_new_child(description, "payload-type"); - + id = g_strdup_printf("%d", purple_media_codec_get_id(codec)); name = purple_media_codec_get_encoding_name(codec); @@ -897,7 +897,7 @@ } gboolean -jingle_rtp_initiate_media(JabberStream *js, const gchar *who, +jingle_rtp_initiate_media(JabberStream *js, const gchar *who, PurpleMediaSessionType type) { /* create content negotiation */ @@ -907,7 +907,7 @@ JabberBuddy *jb; JabberBuddyResource *jbr; const gchar *transport_type; - + gchar *resource = NULL, *me = NULL, *sid = NULL; /* construct JID to send to */ diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/jabber/jingle/session.c --- a/libpurple/protocols/jabber/jingle/session.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/jabber/jingle/session.c Tue Jan 04 06:55:30 2011 +0000 @@ -93,7 +93,7 @@ { GObjectClass *gobject_class = (GObjectClass*)klass; parent_class = g_type_class_peek_parent(klass); - + gobject_class->finalize = jingle_session_finalize; gobject_class->set_property = jingle_session_set_property; gobject_class->get_property = jingle_session_get_property; @@ -221,7 +221,7 @@ case PROP_PENDING_CONTENTS: session->priv->pending_contents = g_value_get_pointer(value); break; - default: + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; } @@ -232,7 +232,7 @@ { JingleSession *session; g_return_if_fail(JINGLE_IS_SESSION(object)); - + session = JINGLE_SESSION(object); switch (prop_id) { @@ -260,8 +260,8 @@ case PROP_PENDING_CONTENTS: g_value_set_pointer(value, session->priv->pending_contents); break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; } } @@ -395,7 +395,7 @@ { return js->sessions != NULL ? g_hash_table_find(js->sessions, - find_by_jid_ghr, (gpointer)jid) : NULL; + find_by_jid_ghr, (gpointer)jid) : NULL; } static xmlnode * @@ -427,7 +427,7 @@ g_free(remote_jid); xmlnode_set_attrib(jingle, "sid", jingle_session_get_sid(session)); - + return jingle; } diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/jabber/jingle/transport.c --- a/libpurple/protocols/jabber/jingle/transport.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/jabber/jingle/transport.c Tue Jan 04 06:55:30 2011 +0000 @@ -111,7 +111,7 @@ g_return_if_fail(JINGLE_IS_TRANSPORT(object)); switch (prop_id) { - default: + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; } @@ -123,8 +123,8 @@ g_return_if_fail(JINGLE_IS_TRANSPORT(object)); switch (prop_id) { - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; } } diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/jabber/jutil.c --- a/libpurple/protocols/jabber/jutil.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/jabber/jutil.c Tue Jan 04 06:55:30 2011 +0000 @@ -731,7 +731,7 @@ } char * -jabber_calculate_data_hash(gconstpointer data, size_t len, +jabber_calculate_data_hash(gconstpointer data, size_t len, const gchar *hash_algo) { PurpleCipherContext *context; diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/jabber/message.c --- a/libpurple/protocols/jabber/message.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/jabber/message.c Tue Jan 04 06:55:30 2011 +0000 @@ -945,7 +945,7 @@ const GList *iterator; GList *valid_smileys = NULL; gboolean has_too_large_smiley = FALSE; - + for (iterator = found_smileys; iterator ; iterator = g_list_next(iterator)) { PurpleSmiley *smiley = (PurpleSmiley *) iterator->data; @@ -976,7 +976,7 @@ "(too large, max is %d)\n", purple_smiley_get_shortcut(smiley), JABBER_DATA_MAX_SIZE); - } + } } if (has_too_large_smiley) { @@ -1244,7 +1244,7 @@ JabberMessage *jm; JabberBuddy *jb; JabberBuddyResource *jbr; - char *resource; + char *resource; js = purple_connection_get_protocol_data(gc); jb = jabber_buddy_find(js, who, TRUE); diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/jabber/parser.c --- a/libpurple/protocols/jabber/parser.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/jabber/parser.c Tue Jan 04 06:55:30 2011 +0000 @@ -109,7 +109,7 @@ js->stream_id = g_strdup(""); purple_debug_info("jabber", "Server failed to specify a stream " "ID (underspecified in rfc3920, but intended " - "to be a MUST; digest legacy auth may fail.\n"); + "to be a MUST; digest legacy auth may fail.\n"); #endif } } else { diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/jabber/si.c --- a/libpurple/protocols/jabber/si.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/jabber/si.c Tue Jan 04 06:55:30 2011 +0000 @@ -858,7 +858,7 @@ purple_network_get_all_local_system_ips(); const char *public_ip; gboolean has_public_ip = FALSE; - + jsx->local_streamhost_fd = sock; jid = g_strdup_printf("%s@%s/%s", jsx->js->user->node, @@ -1238,7 +1238,7 @@ purple_xfer_prepare_thumbnail(xfer, "jpeg,png"); #endif xfer->filename = g_path_get_basename(xfer->local_filename); - + iq = jabber_iq_new(jsx->js, JABBER_IQ_SET); xmlnode_set_attrib(iq->node, "to", xfer->who); si = xmlnode_new_child(iq->node, "si"); @@ -1263,14 +1263,14 @@ mimetype, TRUE, jsx->js); xmlnode *thumbnail = xmlnode_new_child(file, "thumbnail"); xmlnode_set_namespace(thumbnail, NS_THUMBS); - xmlnode_set_attrib(thumbnail, "cid", + xmlnode_set_attrib(thumbnail, "cid", jabber_data_get_cid(thumbnail_data)); xmlnode_set_attrib(thumbnail, "mime-type", mimetype); /* cache data */ jabber_data_associate_local(thumbnail_data, NULL); } #endif - + feature = xmlnode_new_child(si, "feature"); xmlnode_set_namespace(feature, "http://jabber.org/protocol/feature-neg"); x = xmlnode_new_child(feature, "x"); @@ -1505,7 +1505,7 @@ JabberBuddyResource *jbr = NULL; char *resource; GList *resources = NULL; - + if(NULL != (resource = jabber_get_resource(xfer->who))) { /* they've specified a resource, no need to ask or * default or anything, just do it */ @@ -1531,7 +1531,7 @@ } } } - + if (!resources) { /* no resources online, we're trying to send to someone * whose presence we're not subscribed to, or @@ -1560,7 +1560,7 @@ PurpleRequestFields *fields = purple_request_fields_new(); PurpleRequestField *field = purple_request_field_choice_new("resource", _("Resource"), 0); PurpleRequestFieldGroup *group = purple_request_field_group_new(NULL); - + for(l = resources; l; l = l->next) { jbr = l->data; purple_request_field_choice_add(field, jbr->name); @@ -1763,7 +1763,7 @@ purple_xfer_set_request_denied_fnc(xfer, jabber_si_xfer_request_denied); purple_xfer_set_cancel_recv_fnc(xfer, jabber_si_xfer_cancel_recv); purple_xfer_set_end_fnc(xfer, jabber_si_xfer_end); - + js->file_transfers = g_list_append(js->file_transfers, xfer); #if ENABLE_FT_THUMBNAILS diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/jabber/usernick.c --- a/libpurple/protocols/jabber/usernick.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/jabber/usernick.c Tue Jan 04 06:55:30 2011 +0000 @@ -68,7 +68,7 @@ static void do_nick_got_own_nick_cb(JabberStream *js, const char *from, xmlnode *items) { char *oldnickname = NULL; xmlnode *item = NULL; - + if (items) item = xmlnode_get_child(items,"item"); diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/jabber/win32/posix.uname.c --- a/libpurple/protocols/jabber/win32/posix.uname.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/jabber/win32/posix.uname.c Tue Jan 04 06:55:30 2011 +0000 @@ -1,10 +1,10 @@ /* posix.uname.c - version 1.1 - Copyright (C) 1999, 2000 + Copyright (C) 1999, 2000 Earnie Boyd and assigns Fills the utsname structure with the appropriate values. - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1, or (at your option) @@ -131,7 +131,7 @@ strcpy( uts->machine, "unknown" ); break; } - + sLength = sizeof ( uts->nodename ) - 1; GetComputerNameA( uts->nodename, &sLength ); return 1; diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/msn/contact.c --- a/libpurple/protocols/msn/contact.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/msn/contact.c Tue Jan 04 06:55:30 2011 +0000 @@ -1,5 +1,5 @@ /** - * @file contact.c + * @file contact.c * get MSN contacts via SOAP request * created by MaYuan * @@ -339,7 +339,7 @@ g_return_if_fail(session != NULL); g_return_if_fail(session->user != NULL); g_return_if_fail(session->user->passport != NULL); - + purple_debug_info("msn", "Creating an Address Book.\n"); body = g_strdup_printf(MSN_ADD_ADDRESSBOOK_TEMPLATE, @@ -1674,7 +1674,7 @@ msn_callback_state_set_who(state, passport); user = msn_userlist_find_user(session->userlist, passport); - + if (list == MSN_LIST_PL) { partner_scenario = MSN_PS_CONTACT_API; if (user->networkid != MSN_NETWORK_PASSPORT) @@ -1878,7 +1878,7 @@ } else if (state->action & MSN_MOVE_BUDDY) { /* This will be freed when the add contact callback fires */ MsnCallbackState *new_state = msn_callback_state_dup(state); - msn_add_contact_to_group(session, new_state, state->who, guid); + msn_add_contact_to_group(session, new_state, state->who, guid); g_free(guid); return; } diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/msn/directconn.c --- a/libpurple/protocols/msn/directconn.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/msn/directconn.c Tue Jan 04 06:55:30 2011 +0000 @@ -678,7 +678,7 @@ if (dc->state != DC_STATE_FOO && packet_length >= P2P_PACKET_HEADER_SIZE) { MsnP2PHeader *context; - + /* Skip packet size */ context = msn_p2p_header_from_wire(dc->in_buffer + 4); memcpy(&dc->header, context, P2P_PACKET_HEADER_SIZE); diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/msn/error.c --- a/libpurple/protocols/msn/error.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/msn/error.c Tue Jan 04 06:55:30 2011 +0000 @@ -366,7 +366,7 @@ purple_account_get_protocol_name(account)); if (group_name != NULL) - { + { reason = g_strdup_printf(_("%s on the local list is " "inside the group \"%s\" but not on " "the server list. " @@ -374,7 +374,7 @@ passport, group_name); } else - { + { reason = g_strdup_printf(_("%s is on the local list but " "not on the server list. " "Do you want this buddy to be added?"), diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/msn/msg.c --- a/libpurple/protocols/msn/msg.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/msn/msg.c Tue Jan 04 06:55:30 2011 +0000 @@ -347,7 +347,7 @@ { size_t siz; char *body; - + body = msn_slpmsgpart_serialize(msg->part, &siz); memcpy(n, body, siz); @@ -639,7 +639,7 @@ { int i; int bin_len; - + if (msg->part->footer->value == P2P_APPID_SESSION) bin_len = P2P_PACKET_HEADER_SIZE; else @@ -822,7 +822,7 @@ chat = FALSE; if (swboard->conv == NULL) { - if (chat) + if (chat) swboard->conv = purple_find_chat(account->gc, swboard->chat_id); else { swboard->conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, @@ -845,7 +845,7 @@ } /* TODO: Make these not be such duplicates of each other */ -static void +static void got_wink_cb(MsnSlpCall *slpcall, const guchar *data, gsize size) { FILE *f = NULL; @@ -871,7 +871,7 @@ g_free(path); } -static void +static void got_voiceclip_cb(MsnSlpCall *slpcall, const guchar *data, gsize size) { FILE *f = NULL; @@ -1133,7 +1133,7 @@ "Unable to parse invite msg body.\n"); return; } - + /* * GUID is NOT always present but Invitation-Command and Invitation-Cookie * are mandatory. @@ -1150,7 +1150,7 @@ } else if (!strcmp(command, "INVITE")) { const gchar *guid = g_hash_table_lookup(body, "Application-GUID"); - + if (guid == NULL) { purple_debug_warning("msn", "Invite msg missing Application-GUID.\n"); @@ -1189,7 +1189,7 @@ purple_debug_warning("msn", "Unhandled invite msg with GUID %s: %s.\n", guid, application ? application : "(null)"); } - + if (!accepted) { MsnSwitchBoard *swboard = cmdproc->data; char *text; diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/msn/msn.c --- a/libpurple/protocols/msn/msn.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/msn/msn.c Tue Jan 04 06:55:30 2011 +0000 @@ -200,7 +200,7 @@ { const char *type, *friendlyname; struct public_alias_closure *closure; - + g_return_if_fail(cmd->param_count >= 3); type = cmd->params[1]; g_return_if_fail(!strcmp(type, "MFN")); @@ -737,7 +737,7 @@ char *blocked_text; blocked_text = g_strdup_printf(_("MSN servers are currently blocking the following regular expressions:
%s"), session->blocked_text); - + purple_notify_formatted(pc, title, title, NULL, blocked_text, NULL, NULL); g_free(blocked_text); } @@ -760,7 +760,7 @@ return; } - /** apparently the correct value is 777, use 750 as a failsafe */ + /** apparently the correct value is 777, use 750 as a failsafe */ if ((session->passport_info.mail_url == NULL) || (time (NULL) - session->passport_info.mail_timestamp >= 750)) { MsnTransaction *trans; @@ -1586,7 +1586,7 @@ swboard != NULL) { /*User online or have a swboard open because it's invisible * and sent us a message,then send Online Instant Message*/ - + if (msglen + strlen(msgformat) + strlen(VERSION) > 1564) { g_free(msgformat); @@ -1850,7 +1850,7 @@ { /* Remove from local list */ purple_blist_remove_buddy(data->buddy); - + g_free(data); } diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/msn/notification.c --- a/libpurple/protocols/msn/notification.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/msn/notification.c Tue Jan 04 06:55:30 2011 +0000 @@ -2216,7 +2216,7 @@ } /************************************************************************** - * Dispatch server list management + * Dispatch server list management **************************************************************************/ typedef struct MsnAddRemoveListData { MsnCmdProc *cmdproc; diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/msn/oim.c --- a/libpurple/protocols/msn/oim.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/msn/oim.c Tue Jan 04 06:55:30 2011 +0000 @@ -418,8 +418,8 @@ str_reason = _("Message was not sent because an unknown " "error occurred."); } - - msn_session_report_user(oim->session, msg->to_member, + + msn_session_report_user(oim->session, msg->to_member, str_reason, PURPLE_MESSAGE_ERROR); msn_session_report_user(oim->session, msg->to_member, msg->oim_msg, PURPLE_MESSAGE_RAW); diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/msn/p2p.c --- a/libpurple/protocols/msn/p2p.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/msn/p2p.c Tue Jan 04 06:55:30 2011 +0000 @@ -52,7 +52,7 @@ { char *wire; char *tmp; - + tmp = wire = g_new(char, P2P_PACKET_HEADER_SIZE); msn_push32le(tmp, header->session_id); diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/msn/slpmsg.c --- a/libpurple/protocols/msn/slpmsg.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/msn/slpmsg.c Tue Jan 04 06:55:30 2011 +0000 @@ -43,7 +43,7 @@ if (purple_debug_is_verbose()) purple_debug_info("msn", "slpmsg new (%p)\n", slpmsg); - if (slplink) + if (slplink) msn_slpmsg_set_slplink(slpmsg, slplink); else slpmsg->slplink = NULL; diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/msn/slpmsg_part.c --- a/libpurple/protocols/msn/slpmsg_part.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/msn/slpmsg_part.c Tue Jan 04 06:55:30 2011 +0000 @@ -72,7 +72,7 @@ } /* Extract the footer */ - if (body_len >= 0) + if (body_len >= 0) part->footer = msn_p2p_footer_from_wire(data); return part; diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/msn/state.c --- a/libpurple/protocols/msn/state.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/msn/state.c Tue Jan 04 06:55:30 2011 +0000 @@ -223,7 +223,7 @@ } else if (strcmp(client_type, "bot") == 0) { caps |= MSN_CLIENT_CAP_BOT; } - /* MSN doesn't a "console" type... + /* MSN doesn't a "console" type... What, they have no ncurses UI? :-) */ } } diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/msn/switchboard.c --- a/libpurple/protocols/msn/switchboard.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/msn/switchboard.c Tue Jan 04 06:55:30 2011 +0000 @@ -270,7 +270,7 @@ g_free(passport); return; } - + if (!msnuser) { purple_debug_info("msn","User %s is not on our list.\n", passport); msnuser = msn_user_new(userlist, passport, NULL); @@ -831,7 +831,7 @@ data += sizeof("base64:") - 1; image_data = purple_base64_decode(data, &image_len); - if (!image_data || !image_len) + if (!image_data || !image_len) { purple_debug_error("msn", "Unable to decode Ink from Base64 format.\n"); return; diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/msn/tlv.c --- a/libpurple/protocols/msn/tlv.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/msn/tlv.c Tue Jan 04 06:55:30 2011 +0000 @@ -267,7 +267,7 @@ return msn_tlvlist_replace_raw(list, type, 1, v8); } -int +int msn_tlvlist_replace_32(GSList **list, const guint16 type, const guint32 value) { char v32[4]; diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/mxit/chunk.c --- a/libpurple/protocols/mxit/chunk.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/mxit/chunk.c Tue Jan 04 06:55:30 2011 +0000 @@ -591,7 +591,7 @@ case CP_CHUNK_CLICK : /* splash click */ { struct splash_click_chunk* click = g_new0( struct splash_click_chunk, 1 ); - + cr->resources = g_list_append( cr->resources, click ); break; } diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/mxit/login.c --- a/libpurple/protocols/mxit/login.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/mxit/login.c Tue Jan 04 06:55:30 2011 +0000 @@ -111,7 +111,7 @@ /* encrypt the user password */ session->encpwd = mxit_encrypt_password( session ); - state = purple_account_get_int( session->acc, MXIT_CONFIG_STATE, MXIT_STATE_LOGIN ); + state = purple_account_get_int( session->acc, MXIT_CONFIG_STATE, MXIT_STATE_LOGIN ); if ( state == MXIT_STATE_LOGIN ) { /* create and send login packet */ mxit_send_login( session ); diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/mxit/markup.c --- a/libpurple/protocols/mxit/markup.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/mxit/markup.c Tue Jan 04 06:55:30 2011 +0000 @@ -1011,7 +1011,7 @@ { PurpleStoredImage *image; gconstpointer img_data; - gsize img_size; + gsize img_size; gchar* enc; image = purple_imgstore_find_by_id( id ); @@ -1138,7 +1138,7 @@ /* skip to end of tag ('>') */ for ( i++; ( i < len ) && ( message[i] != '>' ) ; i++ ); - + break; case '*' : /* MXit bold */ diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/mxit/multimx.c --- a/libpurple/protocols/mxit/multimx.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/mxit/multimx.c Tue Jan 04 06:55:30 2011 +0000 @@ -73,7 +73,7 @@ * Find a MultiMx session based on Alias * * @param session The MXit session object - * @param roomname The UI room-name + * @param roomname The UI room-name * @return The MultiMX room object (or NULL if not found) */ static struct multimx* find_room_by_alias(struct MXitSession* session, const char* roomname) @@ -647,7 +647,7 @@ /* Send packet to MXit */ mxit_send_message(session, multimx->roomid, message, TRUE, FALSE); - + /* Determine our nickname to display */ if (multimx->nickname) nickname = multimx->nickname; diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/mxit/mxit.c --- a/libpurple/protocols/mxit/mxit.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/mxit/mxit.c Tue Jan 04 06:55:30 2011 +0000 @@ -555,7 +555,7 @@ * Request profile information for another MXit contact. * * @param gc The connection object - * @param who The username of the contact. + * @param who The username of the contact. */ static void mxit_get_info( PurpleConnection *gc, const char *who ) { diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/mxit/profile.c --- a/libpurple/protocols/mxit/profile.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/mxit/profile.c Tue Jan 04 06:55:30 2011 +0000 @@ -107,7 +107,7 @@ * @return Date & Time in a display'able format. */ static const char* datetime( gint64 msecs ) -{ +{ time_t secs = msecs / 1000; struct tm t; @@ -160,7 +160,7 @@ purple_notify_user_info_add_pair( info, _( "Last Online" ), ( profile->lastonline == 0 ) ? _( "Unknown" ) : datetime( profile->lastonline ) ); /* mood */ - if ( contact->mood != MXIT_MOOD_NONE ) + if ( contact->mood != MXIT_MOOD_NONE ) purple_notify_user_info_add_pair( info, _( "Mood" ), mxit_convert_mood_to_name( contact->mood ) ); else purple_notify_user_info_add_pair( info, _( "Mood" ), _( "None" ) ); diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/mxit/protocol.c --- a/libpurple/protocols/mxit/protocol.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/mxit/protocol.c Tue Jan 04 06:55:30 2011 +0000 @@ -647,7 +647,7 @@ "%s%c%i%c%s%c%s%c" /* dateOfBirth\1gender\1location\1capabilities\1 */ "%s%c%i%c%s%c%s", /* dc\1features\1dialingcode\1locale */ session->encpwd, CP_FLD_TERM, MXIT_CP_VERSION, CP_FLD_TERM, CP_MAX_FILESIZE, CP_FLD_TERM, profile->nickname, CP_FLD_TERM, - profile->birthday, CP_FLD_TERM, ( profile->male ) ? 1 : 0, CP_FLD_TERM, MXIT_DEFAULT_LOC, CP_FLD_TERM, MXIT_CP_CAP, CP_FLD_TERM, + profile->birthday, CP_FLD_TERM, ( profile->male ) ? 1 : 0, CP_FLD_TERM, MXIT_DEFAULT_LOC, CP_FLD_TERM, MXIT_CP_CAP, CP_FLD_TERM, session->distcode, CP_FLD_TERM, MXIT_CP_FEATURES, CP_FLD_TERM, session->dialcode, CP_FLD_TERM, locale ); diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/mxit/roster.c --- a/libpurple/protocols/mxit/roster.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/mxit/roster.c Tue Jan 04 06:55:30 2011 +0000 @@ -238,7 +238,7 @@ /*======================================================================================================================== * Subscription Types */ - + /*------------------------------------------------------------------------ * Returns a Contact subscription type as a string. * @@ -468,7 +468,7 @@ if ( !contact ) return; - contact->presence = presence; + contact->presence = presence; contact->mood = mood; /* validate mood */ diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/novell/novell.c --- a/libpurple/protocols/novell/novell.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/novell/novell.c Tue Jan 04 06:55:30 2011 +0000 @@ -678,7 +678,7 @@ ur = nm_conference_get_participant(conference, i); if (ur) { name = nm_user_record_get_display_id(ur); - purple_conv_chat_add_user(PURPLE_CONV_CHAT(chat), name, NULL, + purple_conv_chat_add_user(PURPLE_CONV_CHAT(chat), name, NULL, PURPLE_CBFLAGS_NONE, TRUE); } } @@ -1544,7 +1544,7 @@ } } - purple_notify_userinfo(gc, nm_user_record_get_userid(user_record), + purple_notify_userinfo(gc, nm_user_record_get_userid(user_record), user_info, NULL, NULL); purple_notify_user_info_destroy(user_info); } @@ -1965,7 +1965,7 @@ nm_conference_set_data(conference, (gpointer) chat); name = nm_user_record_get_display_id(ur); - purple_conv_chat_add_user(PURPLE_CONV_CHAT(chat), name, NULL, + purple_conv_chat_add_user(PURPLE_CONV_CHAT(chat), name, NULL, PURPLE_CBFLAGS_NONE, TRUE); } @@ -1977,7 +1977,7 @@ if (ur) { name = nm_user_record_get_display_id(ur); if (!purple_conv_chat_find_user(PURPLE_CONV_CHAT(chat), name)) { - purple_conv_chat_add_user(PURPLE_CONV_CHAT(chat), name, NULL, + purple_conv_chat_add_user(PURPLE_CONV_CHAT(chat), name, NULL, PURPLE_CBFLAGS_NONE, TRUE); } } @@ -2860,7 +2860,7 @@ } purple_notify_user_info_add_pair(user_info, _("Status"), status_str); - + if (text) purple_notify_user_info_add_pair(user_info, _("Message"), text); } diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/null/nullprpl.c --- a/libpurple/protocols/null/nullprpl.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/null/nullprpl.c Tue Jan 04 06:55:30 2011 +0000 @@ -8,18 +8,18 @@ * Nullprpl is a mock protocol plugin for Pidgin and libpurple. You can create * accounts with it, sign on and off, add buddies, and send and receive IMs, * all without connecting to a server! - * + * * Beyond that basic functionality, nullprpl supports presence and * away/available messages, offline messages, user info, typing notification, * privacy allow/block lists, chat rooms, whispering, room lists, and protocol * icons and emblems. Notable missing features are file transfer and account * registration and authentication. - * + * * Nullprpl is intended as an example of how to write a libpurple protocol * plugin. It doesn't contain networking code or an event loop, but it does * demonstrate how to use the libpurple API to do pretty much everything a prpl * might need to do. - * + * * Nullprpl is also a useful tool for hacking on Pidgin, Finch, and other * libpurple clients. It's a full-featured protocol plugin, but doesn't depend * on an external server, so it's a quick and easy way to exercise test new @@ -191,7 +191,7 @@ } -/* +/* * UI callbacks */ static void nullprpl_input_user_info(PurplePluginAction *action) @@ -355,7 +355,7 @@ defaults = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_free); g_hash_table_insert(defaults, "room", g_strdup("default")); return defaults; -} +} static void nullprpl_login(PurpleAccount *acct) { @@ -382,7 +382,7 @@ /* fetch stored offline messages */ purple_debug_info("nullprpl", "checking for offline messages for %s\n", acct->username); - offline_messages = g_hash_table_lookup(goffline_messages, acct->username); + offline_messages = g_hash_table_lookup(goffline_messages, acct->username); while (offline_messages) { GOfflineMessage *message = (GOfflineMessage *)offline_messages->data; purple_debug_info("nullprpl", "delivering offline message to %s: %s\n", diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/oscar/authorization.c --- a/libpurple/protocols/oscar/authorization.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/oscar/authorization.c Tue Jan 04 06:55:30 2011 +0000 @@ -89,7 +89,7 @@ OscarData *od = purple_connection_get_protocol_data(gc); aim_ssi_sendauthreply(od, data->name, 0x00, msg ? msg : _("No reason given.")); - + oscar_free_name_data(data); } diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/oscar/encoding.c --- a/libpurple/protocols/oscar/encoding.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/oscar/encoding.c Tue Jan 04 06:55:30 2011 +0000 @@ -51,7 +51,7 @@ gchar *utf8 = NULL; const gchar *glib_encoding = NULL; gchar *extracted_encoding = encoding_extract(encoding); - + if (extracted_encoding == NULL || *extracted_encoding == '\0') { purple_debug_info("oscar", "Empty encoding, assuming UTF-8\n"); } else if (!g_ascii_strcasecmp(extracted_encoding, "iso-8859-1")) { diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/oscar/family_icq.c --- a/libpurple/protocols/oscar/family_icq.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/oscar/family_icq.c Tue Jan 04 06:55:30 2011 +0000 @@ -88,17 +88,17 @@ g_free(original_snac); return 0; } - + request_type = original_snac->data; original_info_ptr = g_slist_find_custom(od->icq_info, &original_snac->id, compare_icq_infos); original_info = original_info_ptr->data; - + if (!original_info_ptr) { purple_debug_misc("oscar", "icq: the request info for the error packet was not found"); g_free(original_snac); return 0; } - + reason = byte_stream_get16(bs); uin = g_strdup_printf("%u", original_info->uin); switch (*request_type) { diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/oscar/family_locate.c --- a/libpurple/protocols/oscar/family_locate.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/oscar/family_locate.c Tue Jan 04 06:55:30 2011 +0000 @@ -173,7 +173,7 @@ /* Support xtraz statuses */ {OSCAR_CAPABILITY_XTRAZ, - {0x1a, 0x09, 0x3c, 0x6c, 0xd7, 0xFD, 0x4e, 0xc5, + {0x1a, 0x09, 0x3c, 0x6c, 0xd7, 0xFD, 0x4e, 0xc5, 0x9d, 0x51, 0xa6, 0x47, 0x4e, 0x34, 0xf5, 0xa0}}, {OSCAR_CAPABILITY_SENDBUDDYLIST, @@ -630,7 +630,7 @@ for (i = 0; icq_custom_icons[i].mood; i++) { if (memcmp(&icq_custom_icons[i].data, cap, 0x10) == 0) { - purple_debug_misc("oscar", "Custom status icon: %s\n", icq_purple_moods[i].description); + purple_debug_misc("oscar", "Custom status icon: %s\n", icq_purple_moods[i].description); result = icq_custom_icons[i].mood; break; /* should only match once... */ } diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/oscar/odc.c --- a/libpurple/protocols/oscar/odc.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/oscar/odc.c Tue Jan 04 06:55:30 2011 +0000 @@ -112,7 +112,7 @@ byte_stream_put16(&bs, 0x0000); byte_stream_put32(&bs, frame->payload.len); byte_stream_put16(&bs, frame->encoding); - byte_stream_put16(&bs, 0x0000); + byte_stream_put16(&bs, 0x0000); byte_stream_put16(&bs, 0x0000); byte_stream_put16(&bs, frame->flags); byte_stream_put16(&bs, 0x0000); diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/oscar/oscar.c --- a/libpurple/protocols/oscar/oscar.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/oscar/oscar.c Tue Jan 04 06:55:30 2011 +0000 @@ -1026,7 +1026,7 @@ conn->cookie = g_memdup(cookie, cookielen); /* - * Use TLS only if the server provided us with a tls_certname. The server might not specify a tls_certname even if we requested to use TLS, + * Use TLS only if the server provided us with a tls_certname. The server might not specify a tls_certname even if we requested to use TLS, * and that is something we should be prepared to. */ if (tls_certname) @@ -1293,7 +1293,7 @@ PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT, _("You required encryption in your account settings, but one of the servers doesn't support it.")); return 0; - } + } } /* @@ -3215,7 +3215,7 @@ g_string_free(data, TRUE); purple_debug_info("oscar", "sending direct IM %s using charset %i", msg->str, charset); - + peer_odc_send_im(conn, msg->str, msg->len, charset, imflags & PURPLE_MESSAGE_AUTO_RESP); g_string_free(msg, TRUE); @@ -3582,7 +3582,7 @@ } itmsurl = purple_status_get_attr_string(status, "itmsurl"); - + aim_srv_setextrainfo(od, TRUE, oscar_get_extended_status(gc), TRUE, status_text, itmsurl); g_free(status_text); } diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/qq/buddy_opt.c --- a/libpurple/protocols/qq/buddy_opt.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/qq/buddy_opt.c Tue Jan 04 06:55:30 2011 +0000 @@ -114,7 +114,7 @@ purple_debug_error("QQ", "Can not find purple buddy of %u\n", uid); return NULL; } - + if ((bd = purple_buddy_get_protocol_data(buddy)) == NULL) { purple_debug_error("QQ", "Can not find buddy data of %u\n", uid); return NULL; diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/qq/qq.c --- a/libpurple/protocols/qq/qq.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/qq/qq.c Tue Jan 04 06:55:30 2011 +0000 @@ -57,7 +57,7 @@ #include "utils.h" #include "version.h" -#define OPENQ_VERSION "0.3.2-p20" +#define OPENQ_VERSION "0.3.2-p20" static GList *server_list_build(gchar select) { diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/qq/qq_crypt.c --- a/libpurple/protocols/qq/qq_crypt.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/qq/qq_crypt.c Tue Jan 04 06:55:30 2011 +0000 @@ -24,7 +24,7 @@ * * QQ encryption algorithm * Convert from ASM code provided by PerlOICQ - * + * * Puzzlebird, Nov-Dec 2002 */ @@ -34,8 +34,8 @@ OUT: 64 bits of data in w[0] - w[1]. KEY: 128 bits of key in k[0] - k[3]. -delta is chosen to be the real part of -the golden ratio: Sqrt(5/4) - 1/2 ~ 0.618034 multiplied by 2^32. +delta is chosen to be the real part of +the golden ratio: Sqrt(5/4) - 1/2 ~ 0.618034 multiplied by 2^32. 0x61C88647 is what we can track on the ASM codes.!! */ @@ -53,7 +53,7 @@ for (i = 0; i < bytes; i += 16) { /* length label */ printf("%07x: ", i); - + /* dump hex value */ for (j = 0; j < 16; j++) { if (j == 8) { @@ -64,10 +64,10 @@ else printf(" "); } - + printf(" "); - - + + /* dump ascii value */ for (j = 0; j < 16 && (i + j) < bytes; j++) { ch = buffer[i + j] & 127; @@ -87,21 +87,21 @@ #endif /******************************************************************** - * encryption + * encryption *******************************************************************/ /* Tiny Encryption Algorithm (TEA) */ static inline void qq_encipher(guint32 *const v, const guint32 *const k, guint32 *const w) { register guint32 - y = g_ntohl(v[0]), - z = g_ntohl(v[1]), - a = g_ntohl(k[0]), - b = g_ntohl(k[1]), - c = g_ntohl(k[2]), - d = g_ntohl(k[3]), - n = 0x10, - sum = 0, + y = g_ntohl(v[0]), + z = g_ntohl(v[1]), + a = g_ntohl(k[0]), + b = g_ntohl(k[1]), + c = g_ntohl(k[2]), + d = g_ntohl(k[3]), + n = 0x10, + sum = 0, delta = 0x9E3779B9; /* 0x9E3779B9 - 0x100000000 = -0x61C88647 */ while (n-- > 0) { @@ -117,8 +117,8 @@ /* it can be the real random seed function */ /* override with number, convenient for debug */ #ifdef DEBUG -static gint crypt_rand(void) { - return 0xdead; +static gint crypt_rand(void) { + return 0xdead; } #else #include @@ -126,7 +126,7 @@ #endif /* 64-bit blocks and some kind of feedback mode of operation */ -static inline void encrypt_out(guint8 *crypted, const gint crypted_len, const guint8 *key) +static inline void encrypt_out(guint8 *crypted, const gint crypted_len, const guint8 *key) { /* ships in encipher */ guint32 plain32[2]; @@ -134,34 +134,34 @@ guint32 key32[4]; guint32 crypted32[2]; guint32 c32_prev[2]; - + guint8 *crypted_ptr; gint count64; - + /* prepare at first */ crypted_ptr = crypted; - + memcpy(crypted32, crypted_ptr, sizeof(crypted32)); c32_prev[0] = crypted32[0]; c32_prev[1] = crypted32[1]; - + p32_prev[0] = 0; p32_prev[1] = 0; plain32[0] = crypted32[0] ^ p32_prev[0]; plain32[1] = crypted32[1] ^ p32_prev[1]; - + g_memmove(key32, key, 16); count64 = crypted_len / 8; while (count64-- > 0){ /* encrypt it */ qq_encipher(plain32, key32, crypted32); - + crypted32[0] ^= p32_prev[0]; crypted32[1] ^= p32_prev[1]; - + /* store curr 64 bits crypted */ g_memmove(crypted_ptr, crypted32, sizeof(crypted32)); - + /* set prev */ p32_prev[0] = plain32[0]; p32_prev[1] = plain32[1]; c32_prev[0] = crypted32[0]; c32_prev[1] = crypted32[1]; - + /* set next 64 bits want to crypt*/ if (count64 > 0) { crypted_ptr += 8; @@ -181,7 +181,7 @@ { guint8 *crypted_ptr = crypted; /* current position of dest */ gint pos, padding; - + padding = (plain_len + 10) % 8; if (padding) { padding = 8 - padding; @@ -223,20 +223,20 @@ return pos; } -/******************************************************************** - * decryption +/******************************************************************** + * decryption ********************************************************************/ static inline void qq_decipher(guint32 *const v, const guint32 *const k, guint32 *const w) { register guint32 - y = g_ntohl(v[0]), - z = g_ntohl(v[1]), - a = g_ntohl(k[0]), - b = g_ntohl(k[1]), - c = g_ntohl(k[2]), - d = g_ntohl(k[3]), - n = 0x10, + y = g_ntohl(v[0]), + z = g_ntohl(v[1]), + a = g_ntohl(k[0]), + b = g_ntohl(k[1]), + c = g_ntohl(k[2]), + d = g_ntohl(k[3]), + n = 0x10, sum = 0xE3779B90, /* why this ? must be related with n value */ delta = 0x9E3779B9; @@ -251,7 +251,7 @@ w[1] = g_htonl(z); } -static inline gint decrypt_out(guint8 *dest, gint crypted_len, const guint8* const key) +static inline gint decrypt_out(guint8 *dest, gint crypted_len, const guint8* const key) { gint plain_len; guint32 key32[4]; @@ -280,7 +280,7 @@ if( plain_len < 0 ) { return -2; } - + count64 = crypted_len / 8; while (--count64 > 0){ c32_prev[0] = crypted32[0]; c32_prev[1] = crypted32[1]; @@ -290,7 +290,7 @@ p32_prev[0] ^= crypted32[0]; p32_prev[1] ^= crypted32[1]; qq_decipher(p32_prev, key32, p32_prev); - + plain32[0] = p32_prev[0] ^ c32_prev[0]; plain32[1] = p32_prev[1] ^ c32_prev[1]; memcpy(crypted_ptr, plain32, sizeof(plain32)); } @@ -306,7 +306,7 @@ gint pos; /* at least 16 bytes and %8 == 0 */ - if ((crypted_len % 8) || (crypted_len < 16)) { + if ((crypted_len % 8) || (crypted_len < 16)) { return -1; } diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/sametime/sametime.c --- a/libpurple/protocols/sametime/sametime.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/sametime/sametime.c Tue Jan 04 06:55:30 2011 +0000 @@ -317,12 +317,12 @@ /** resolves a mwSession from a PurpleConnection */ static struct mwSession *gc_to_session(PurpleConnection *gc) { struct mwPurplePluginData *pd; - + g_return_val_if_fail(gc != NULL, NULL); - + pd = gc->proto_data; g_return_val_if_fail(pd != NULL, NULL); - + return pd->session; } @@ -355,7 +355,7 @@ while(avail) { ret = write(pd->socket, circ->outptr, avail); - + if(ret <= 0) break; @@ -438,7 +438,7 @@ g_return_if_fail(pd != NULL); gc = pd->gc; - + if(pd->outpa) { purple_input_remove(pd->outpa); pd->outpa = 0; @@ -448,7 +448,7 @@ close(pd->socket); pd->socket = 0; } - + if(gc->inpa) { purple_input_remove(gc->inpa); gc->inpa = 0; @@ -489,7 +489,7 @@ PurpleConnection *gc; PurpleAccount *acct; - + struct mwPurplePluginData *pd; guint32 idle; guint stat; @@ -507,7 +507,7 @@ if(idle) { guint32 idle_len; /*< how long a client has been idle */ guint32 ugly_idle_len; /*< how long a broken client has been idle */ - + DEBUG_INFO("%s has idle value 0x%x\n", NSTR(id), idle); idle_len = time(NULL) - idle; @@ -518,7 +518,7 @@ else ugly_idle_len = (ugly_idle_len - idle) / 1000; - /* + /* what's the deal here? Well, good clients are smart enough to publish their idle time by using an attribute to indicate that they went idle at some time UTC, in seconds since epoch. Bad @@ -554,16 +554,16 @@ case mwStatus_IDLE: if(! idle) idle = -1; break; - + case mwStatus_AWAY: status = MW_STATE_AWAY; break; - + case mwStatus_BUSY: status = MW_STATE_BUSY; break; } - + /* NAB group members */ if(aware->group) { PurpleGroup *group; @@ -593,7 +593,7 @@ purple_blist_node_set_int(bnode, BUDDY_KEY_TYPE, mwSametimeUser_NORMAL); } - + if(aware->online) { purple_prpl_got_user_status(acct, id, status, NULL); purple_prpl_got_user_idle(acct, id, !!idle, (time_t) idle); @@ -628,17 +628,17 @@ returns that list. */ static struct mwAwareList * list_ensure(struct mwPurplePluginData *pd, PurpleGroup *group) { - + struct mwAwareList *list; - + g_return_val_if_fail(pd != NULL, NULL); g_return_val_if_fail(group != NULL, NULL); - + list = g_hash_table_lookup(pd->group_list_map, group); if(! list) { list = mwAwareList_new(pd->srvc_aware, &mw_aware_list_handler); mwAwareList_setClientData(list, pd->gc, NULL); - + mwAwareList_watchAttributes(list, mwAttribute_AV_PREFS_SET, mwAttribute_MICROPHONE, @@ -650,7 +650,7 @@ g_hash_table_replace(pd->group_list_map, group, list); g_hash_table_insert(pd->group_list_map, list, group); } - + return list; } @@ -689,7 +689,7 @@ /* if it's a normal group with none of our people in it, skip it */ if(gtype == mwSametimeGroup_NORMAL && !purple_group_on_account(grp, acct)) continue; - + /* if the group has an owner and we're not it, skip it */ owner = purple_blist_node_get_string(gn, GROUP_KEY_OWNER); if(owner && strcmp(owner, purple_account_get_username(acct))) @@ -740,7 +740,7 @@ } } } - } + } } @@ -842,7 +842,7 @@ blist_schedule(pd); - g_list_free(add); + g_list_free(add); } @@ -866,11 +866,11 @@ buddy = purple_find_buddy_in_group(acct, id, group); if(! buddy) { buddy = purple_buddy_new(acct, id, alias); - + purple_blist_add_buddy(buddy, NULL, group, NULL); buddy_add(pd, buddy); } - + purple_blist_alias_buddy(buddy, alias); purple_blist_server_alias_buddy(buddy, name); purple_blist_node_set_string((PurpleBlistNode *) buddy, BUDDY_KEY_NAME, name); @@ -888,7 +888,7 @@ struct mwAwareList *list; const char *n; GList *add; - + n = purple_blist_node_get_string((PurpleBlistNode *) group, GROUP_KEY_NAME); if(! n) n = purple_group_get_name(group); @@ -965,7 +965,7 @@ purple_blist_node_set_string(gn, GROUP_KEY_OWNER, owner); group_add(gc->proto_data, group); } - + return group; } @@ -1025,7 +1025,7 @@ PurpleBuddy *gb = (PurpleBuddy *) bn; if(! PURPLE_BLIST_NODE_IS_BUDDY(bn)) continue; - + if(purple_buddy_get_account(gb) == acct) { DEBUG_INFO("clearing %s from group\n", NSTR(purple_buddy_get_name(gb))); prune = g_list_prepend(prune, gb); @@ -1057,7 +1057,7 @@ PurpleAccount *acct; PurpleBlistNode *gn, *cn, *bn; - + GHashTable *stusers; GList *prune = NULL; GList *ul, *utl; @@ -1070,7 +1070,7 @@ g_return_if_fail(acct != NULL); stusers = g_hash_table_new(g_str_hash, g_str_equal); - + /* build a hash table for quick lookup while pruning the group contents */ utl = mwSametimeGroup_getUsers(stgroup); @@ -1205,7 +1205,7 @@ of our members in it, so don't fully delete it */ del = FALSE; } - + group_clear(g_prune->data, acct, del); g_prune = g_list_delete_link(g_prune, g_prune); } @@ -1280,7 +1280,7 @@ conv = mwServiceIm_getConversation(pd->srvc_im, &who); convo_features(conv); - + if(mwConversation_isClosed(conv)) mwConversation_open(conv); } @@ -1391,7 +1391,7 @@ } } } - + if(add_buds) { purple_account_add_buddies(acct, add_buds); g_list_free(add_buds); @@ -1412,7 +1412,7 @@ /* grab the buddy list from the server */ unit = mwStorageUnit_new(mwStore_AWARE_LIST); - mwServiceStorage_load(pd->srvc_store, unit, fetch_blist_cb, pd, NULL); + mwServiceStorage_load(pd->srvc_store, unit, fetch_blist_cb, pd, NULL); /* find all the NAB groups and subscribe to them */ for(l = purple_blist_get_root(); l; @@ -1492,7 +1492,7 @@ acct = purple_connection_get_account(pd->gc); status = purple_account_get_active_status(acct); mw_prpl_set_status(acct, status); - + /* start watching for new conversations */ purple_signal_connect(purple_conversations_get_handle(), "conversation-created", pd, @@ -1502,7 +1502,7 @@ purple_signal_connect(purple_blist_get_handle(), "blist-node-extended-menu", pd, PURPLE_CALLBACK(blist_node_menu_cb), pd); - + /* use our services to do neat things */ services_starting(pd); } @@ -1733,7 +1733,7 @@ int ret = 0, err = 0; g_return_if_fail(pd != NULL); - + ret = read_recv(pd->session, pd->socket); /* normal operation ends here */ @@ -1826,7 +1826,7 @@ PurpleBuddy *buddy; char *who = from->user_id; char *msg; - + pd = mwSession_getClientData(s); acct = purple_connection_get_account(pd->gc); conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, who, acct); @@ -1886,7 +1886,7 @@ static void mw_conf_invited(struct mwConference *conf, struct mwLoginInfo *inviter, const char *invitation) { - + struct mwServiceConference *srvc; struct mwSession *session; struct mwPurplePluginData *pd; @@ -1943,7 +1943,7 @@ struct mwServiceConference *srvc = pd->srvc_conf; struct mwConference *conf = NULL; GList *l, *ll; - + ll = mwServiceConference_getConferences(srvc); for(l = ll; l; l = l->next) { struct mwConference *c = l->data; @@ -1955,7 +1955,7 @@ } } g_list_free(ll); - + return conf; } @@ -2042,7 +2042,7 @@ static void mw_conf_peer_parted(struct mwConference *conf, struct mwLoginInfo *peer) { - + struct mwServiceConference *srvc; struct mwSession *session; struct mwPurplePluginData *pd; @@ -2067,7 +2067,7 @@ static void mw_conf_text(struct mwConference *conf, struct mwLoginInfo *who, const char *text) { - + struct mwServiceConference *srvc; struct mwSession *session; struct mwPurplePluginData *pd; @@ -2141,7 +2141,7 @@ static void ft_incoming_init(PurpleXfer *xfer) { /* incoming transfer accepted */ - + /* - accept the mwFileTransfer - open/create the local FILE "wb" - stick the FILE's fp in xfer->dest_fp @@ -2222,7 +2222,7 @@ rem = mwFileTransfer_getRemaining(ft); if(rem < MW_FT_LEN) o.len = rem; - + if(fread(buf, (size_t) o.len, 1, fp)) { /* calculate progress and display it */ @@ -2261,7 +2261,7 @@ if(purple_xfer_get_type(xfer) == PURPLE_XFER_SEND) { xfer->dest_fp = g_fopen(xfer->local_filename, "rb"); ft_send(ft, xfer->dest_fp); - } + } } @@ -2454,7 +2454,7 @@ m->data = g_strdup(data); m->clear = g_free; break; - + case mwImSend_TYPING: default: m->data = (gpointer) data; @@ -2470,22 +2470,22 @@ PurpleConversation *gconv; char *tmp, *text; struct mwIdBlock *idb; - + idb = mwConversation_getTarget(conv); - + tmp = mwError(err); text = g_strconcat(_("Unable to send message: "), tmp, NULL); - + gconv = convo_get_gconv(conv); if(gconv && !purple_conv_present_error(idb->user, gconv->account, text)) { - + g_free(text); text = g_strdup_printf(_("Unable to send message to %s:"), (idb->user)? idb->user: "(unknown)"); purple_notify_error(purple_account_get_connection(gconv->account), NULL, text, tmp); } - + g_free(tmp); g_free(text); } @@ -2494,7 +2494,7 @@ static void convo_queue_send(struct mwConversation *conv) { struct convo_data *cd; GList *l; - + cd = mwConversation_getClientData(conv); for(l = cd->queue; l; l = g_list_delete_link(l, l)) { @@ -2580,7 +2580,7 @@ cd = mwConversation_getClientData(conv); if(cd) { convo_queue_send(conv); - + if(! convo_get_gconv(conv)) { mwConversation_free(conv); return; @@ -2594,7 +2594,7 @@ PurpleBuddy *buddy; struct mwLoginInfo *info; info = mwConversation_getTargetInfo(conv); - + buddy = purple_find_buddy(acct, info->user_id); if(buddy) { purple_blist_node_set_int((PurpleBlistNode *) buddy, @@ -2741,7 +2741,7 @@ /* don't want the contained string to ever be NULL */ str = g_string_new(""); - + doc = purple_mime_document_parse(data); /* handle all the MIME parts */ @@ -2755,7 +2755,7 @@ if(! type) { ; /* feh */ - + } else if(purple_str_has_prefix(type, "image")) { /* put images into the image store */ @@ -2766,7 +2766,7 @@ /* obtain and unencode the data */ purple_mime_part_get_data_decoded(part, &d_dat, &d_len); - + /* look up the content id */ cid = (char *) purple_mime_part_get_field(part, "Content-ID"); cid = make_cid(cid); @@ -2779,7 +2779,7 @@ /* recall the image for dereferencing later */ images = g_list_append(images, GINT_TO_POINTER(img)); - + } else if(purple_str_has_prefix(type, "text")) { /* concatenate all the text parts together */ @@ -2790,7 +2790,7 @@ g_string_append(str, (const char *)data); g_free(data); } - } + } purple_mime_document_free(doc); @@ -2839,7 +2839,7 @@ im_recv_html(conv, pd, str->str); g_string_free(str, TRUE); - + /* clean up the cid table */ g_hash_table_destroy(img_by_cid); @@ -2905,7 +2905,7 @@ pd = mwSession_getClientData(session); idb = mwConversation_getTarget(conv); - + ht = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_free); g_hash_table_insert(ht, CHAT_KEY_CREATOR, g_strdup(idb->user)); g_hash_table_insert(ht, CHAT_KEY_NAME, g_strdup(name)); @@ -3246,7 +3246,7 @@ static const char* mw_prpl_list_emblem(PurpleBuddy *b) { - if(buddy_is_external(b)) + if(buddy_is_external(b)) return "external"; return NULL; @@ -3292,22 +3292,22 @@ static char *user_supports_text(struct mwServiceAware *srvc, const char *who) { const char *feat[] = {NULL, NULL, NULL, NULL, NULL}; const char **f = feat; - + if(user_supports(srvc, who, mwAttribute_AV_PREFS_SET)) { gboolean mic, speak, video; - + mic = user_supports(srvc, who, mwAttribute_MICROPHONE); speak = user_supports(srvc, who, mwAttribute_SPEAKERS); video = user_supports(srvc, who, mwAttribute_VIDEO_CAMERA); - + if(mic) *f++ = _("Microphone"); if(speak) *f++ = _("Speakers"); if(video) *f++ = _("Video Camera"); } - + if(user_supports(srvc, who, mwAttribute_FILE_TRANSFER)) *f++ = _("File Transfer"); - + return (*feat)? g_strjoinv(", ", (char **)feat): NULL; /* jenni loves siege */ } @@ -3431,7 +3431,7 @@ const char *msgA; const char *msgB; char *msg1; - + g_return_if_fail(buddy != NULL); acct = purple_buddy_get_account(buddy); @@ -3439,18 +3439,18 @@ gc = purple_account_get_connection(acct); g_return_if_fail(gc != NULL); - + fields = purple_request_fields_new(); g = purple_request_field_group_new(NULL); purple_request_fields_add_group(fields, g); - + f = purple_request_field_string_new(CHAT_KEY_TOPIC, _("Topic"), NULL, FALSE); purple_request_field_group_add_field(g, f); f = purple_request_field_string_new(CHAT_KEY_INVITE, _("Message"), msg, FALSE); purple_request_field_group_add_field(g, f); - + msgA = _("Create conference with user"); msgB = _("Please enter a topic for the new conference, and an invitation" " message to be sent to %s"); @@ -3477,7 +3477,7 @@ PurpleRequestField *f; GList *l; const char *msg; - + f = purple_request_fields_get_field(fields, CHAT_KEY_INVITE); msg = purple_request_field_string_get_value(f); @@ -3486,7 +3486,7 @@ if(l) { gpointer d = purple_request_field_list_get_data(f, l->data); - + if(GPOINTER_TO_INT(d) == 0x01) { blist_menu_conf_create(buddy, msg); @@ -3500,7 +3500,7 @@ static void blist_menu_conf_list(PurpleBuddy *buddy, GList *confs) { - + PurpleRequestFields *fields; PurpleRequestFieldGroup *g; PurpleRequestField *f; @@ -3519,7 +3519,7 @@ g_return_if_fail(gc != NULL); fields = purple_request_fields_new(); - + g = purple_request_field_group_new(NULL); purple_request_fields_add_group(fields, g); @@ -3532,10 +3532,10 @@ purple_request_field_list_add_icon(f, _("Create New Conference..."), NULL, GINT_TO_POINTER(0x01)); purple_request_field_group_add_field(g, f); - + f = purple_request_field_string_new(CHAT_KEY_INVITE, "Message", NULL, FALSE); purple_request_field_group_add_field(g, f); - + msgA = _("Invite user to a conference"); msgB = _("Select a conference from the list below to send an invite to" " user %s. Select \"Create New Conference\" if you'd like to" @@ -3655,12 +3655,12 @@ static GList *mw_prpl_chat_info(PurpleConnection *gc) { GList *l = NULL; struct proto_chat_entry *pce; - + pce = g_new0(struct proto_chat_entry, 1); pce->label = _("Topic:"); pce->identifier = CHAT_KEY_TOPIC; l = g_list_append(l, pce); - + return l; } @@ -3708,13 +3708,13 @@ PurpleAccount *acct; const char *msgA; char *msg; - + acct = purple_connection_get_account(gc); msgA = _("No host or IP address has been configured for the" " Meanwhile account %s. Please enter one below to" " continue logging in."); msg = g_strdup_printf(msgA, NSTR(purple_account_get_username(acct))); - + purple_request_input(gc, _("Meanwhile Connection Setup"), _("No Sametime Community Server Specified"), msg, MW_PLUGIN_DEFAULT_HOST, FALSE, FALSE, NULL, @@ -3748,7 +3748,7 @@ *host++ = '\0'; purple_account_set_string(account, MW_KEY_HOST, host); purple_account_set_username(account, user); - + } else { host = (char *) purple_account_get_string(account, MW_KEY_HOST, MW_PLUGIN_DEFAULT_HOST); @@ -3787,10 +3787,10 @@ DEBUG_INFO("client id: 0x%04x\n", client); DEBUG_INFO("client major: 0x%04x\n", major); DEBUG_INFO("client minor: 0x%04x\n", minor); - + mwSession_setProperty(pd->session, mwSession_CLIENT_TYPE_ID, GUINT_TO_POINTER(client), NULL); - + mwSession_setProperty(pd->session, mwSession_CLIENT_VER_MAJOR, GUINT_TO_POINTER(major), NULL); @@ -3928,7 +3928,7 @@ (const char **) &end, &attr)) { char *id; PurpleStoredImage *img = NULL; - + gsize len = (start - tmp); /* append the in-between-tags text */ @@ -3971,7 +3971,7 @@ /* append the modified tag */ g_string_append_printf(str, "", cid); g_free(cid); - + } else { /* append the literal image tag, since we couldn't find a relative imgstore object */ @@ -4045,7 +4045,7 @@ tmp = im_mime_convert(gc, conv, message); ret = mwConversation_send(conv, mwImSend_MIME, tmp); g_free(tmp); - + } else if(mwConversation_supports(conv, mwImSend_HTML)) { /* send an HTML message */ @@ -4063,7 +4063,7 @@ ret = mwConversation_send(conv, mwImSend_PLAIN, tmp); g_free(tmp); } - + return !ret; } else { @@ -4084,7 +4084,7 @@ static unsigned int mw_prpl_send_typing(PurpleConnection *gc, const char *name, PurpleTypingState state) { - + struct mwPurplePluginData *pd; struct mwIdBlock who = { (char *) name, NULL }; struct mwConversation *conv; @@ -4100,14 +4100,14 @@ if(mwConversation_isOpen(conv)) { mwConversation_send(conv, mwImSend_TYPING, t); - + } else if((state == PURPLE_TYPING) || (state == PURPLE_TYPED)) { /* only open a channel for sending typing notification, not for when typing has stopped. There's no point in re-opening a channel just to tell someone that this side isn't typing. */ - + convo_queue(conv, mwImSend_TYPING, t); - + if(! mwConversation_isPending(conv)) { mwConversation_open(conv); } @@ -4121,7 +4121,7 @@ switch(type) { case mwLogin_LIB: return "Lotus Binary Library"; - + case mwLogin_JAVA_WEB: return "Lotus Java Client Applet"; @@ -4214,11 +4214,11 @@ tmp = g_strdup_printf(_("Unknown (0x%04x)
"), type); purple_notify_user_info_add_pair(user_info, _("Last Known Client"), tmp); - + g_free(tmp); } } - + tmp = user_supports_text(pd->srvc_aware, who); if(tmp) { purple_notify_user_info_add_pair(user_info, _("Supports"), tmp); @@ -4244,65 +4244,65 @@ purple_notify_userinfo(gc, who, user_info, NULL, NULL); purple_notify_user_info_destroy(user_info); } - - + + static void mw_prpl_set_status(PurpleAccount *acct, PurpleStatus *status) { PurpleConnection *gc; const char *state; char *message = NULL; struct mwSession *session; struct mwUserStatus stat; - + g_return_if_fail(acct != NULL); gc = purple_account_get_connection(acct); - + state = purple_status_get_id(status); - + DEBUG_INFO("Set status to %s\n", purple_status_get_name(status)); - + g_return_if_fail(gc != NULL); - + session = gc_to_session(gc); g_return_if_fail(session != NULL); - + /* get a working copy of the current status */ mwUserStatus_clone(&stat, mwSession_getUserStatus(session)); - + /* determine the state */ if(! strcmp(state, MW_STATE_ACTIVE)) { stat.status = mwStatus_ACTIVE; - + } else if(! strcmp(state, MW_STATE_AWAY)) { stat.status = mwStatus_AWAY; - + } else if(! strcmp(state, MW_STATE_BUSY)) { stat.status = mwStatus_BUSY; } - + /* determine the message */ message = (char *) purple_status_get_attr_string(status, MW_STATE_MESSAGE); - + if(message) { /* all the possible non-NULL values of message up to this point are const, so we don't need to free them */ message = purple_markup_strip_html(message); } - + /* out with the old */ g_free(stat.desc); - + /* in with the new */ stat.desc = (char *) message; - + mwSession_setUserStatus(session, &stat); mwUserStatus_clear(&stat); } - + static void mw_prpl_set_idle(PurpleConnection *gc, int t) { struct mwSession *session; struct mwUserStatus stat; - + session = gc_to_session(gc); g_return_if_fail(session != NULL); @@ -4347,7 +4347,7 @@ static void notify_add(PurpleConnection *gc, GList *row, void *user_data) { BuddyAddData *data = user_data; const char *group_name = NULL; - + if (data && data->group) { group_name = purple_group_get_name(data->group); } @@ -4392,13 +4392,13 @@ for(l = result->matches; l; l = l->next) { struct mwResolveMatch *match = l->data; GList *row = NULL; - + DEBUG_INFO("multi resolve: %s, %s\n", NSTR(match->id), NSTR(match->name)); if(!match->id || !match->name) continue; - + row = g_list_append(row, g_strdup(match->name)); row = g_list_append(row, g_strdup(match->id)); purple_notify_searchresults_row_add(sres, row); @@ -4440,7 +4440,7 @@ if(!code && res && res->matches) { if(!res->matches->next) { struct mwResolveMatch *match = res->matches->data; - + /* only one? that might be the right one! */ if(strcmp(res->name, match->id)) { /* uh oh, the single result isn't identical to the search @@ -4448,7 +4448,7 @@ the user meant to add */ purple_blist_remove_buddy(buddy); multi_resolved_query(res, gc, data); - + } else { /* same person, set the server alias */ @@ -4463,13 +4463,13 @@ g_free(data); } - + } else { /* prompt user if more than one match was returned */ purple_blist_remove_buddy(buddy); multi_resolved_query(res, gc, data); } - + return; } @@ -4628,7 +4628,7 @@ static void privacy_fill(struct mwPrivacyInfo *priv, GSList *members) { - + struct mwUserItem *u; guint count; @@ -4690,7 +4690,7 @@ DEBUG_INFO("PURPLE_PRIVACY_DENY_ALL\n"); privacy.deny = FALSE; break; - + default: DEBUG_INFO("acct->perm_deny is 0x%x\n", acct->perm_deny); return; @@ -4745,12 +4745,12 @@ struct mwPurplePluginData *pd; char *c, *t; - + pd = gc->proto_data; c = g_hash_table_lookup(components, CHAT_KEY_NAME); t = g_hash_table_lookup(components, CHAT_KEY_TOPIC); - + if(g_hash_table_lookup(components, CHAT_KEY_IS_PLACE)) { /* use place service */ struct mwServicePlace *srvc; @@ -4759,7 +4759,7 @@ srvc = pd->srvc_place; place = mwPlace_new(srvc, c, t); mwPlace_open(place); - + } else { /* use conference service */ struct mwServiceConference *srvc; @@ -4771,7 +4771,7 @@ if(conf) { DEBUG_INFO("accepting conference invitation\n"); mwConference_accept(conf); - + } else { DEBUG_INFO("creating new conference\n"); conf = mwConference_new(srvc, t); @@ -4787,7 +4787,7 @@ struct mwPurplePluginData *pd; struct mwServiceConference *srvc; char *c; - + pd = gc->proto_data; srvc = pd->srvc_conf; @@ -5046,7 +5046,7 @@ srvc = pd->srvc_aware; g_return_val_if_fail(srvc != NULL, FALSE); - + acct = purple_connection_get_account(gc); g_return_val_if_fail(acct != NULL, FALSE); @@ -5097,7 +5097,7 @@ char *tmp = strrchr(filename, G_DIR_SEPARATOR); if(tmp++) filename = tmp; } - + ft = mwFileTransfer_new(srvc, &idb, NULL, filename, filesize); purple_xfer_ref(xfer); @@ -5110,7 +5110,7 @@ static void ft_outgoing_cancel(PurpleXfer *xfer) { struct mwFileTransfer *ft = xfer->data; - + DEBUG_INFO("ft_outgoing_cancel called\n"); if(ft) mwFileTransfer_cancel(ft); @@ -5210,7 +5210,7 @@ .offline_message = NULL, .whiteboard_prpl_ops = NULL, .send_raw = NULL, - .struct_size = sizeof(PurplePluginProtocolInfo) + .struct_size = sizeof(PurplePluginProtocolInfo) }; @@ -5220,10 +5220,10 @@ PurplePluginPref *pref; frame = purple_plugin_pref_frame_new(); - + pref = purple_plugin_pref_new_with_label(_("Remotely Stored Buddy List")); purple_plugin_pref_frame_add(frame, pref); - + pref = purple_plugin_pref_new_with_name(MW_PRPL_OPT_BLIST_ACTION); purple_plugin_pref_set_label(pref, _("Buddy List Storage Mode")); @@ -5344,7 +5344,7 @@ static void remote_group_multi_cleanup(gpointer ignore, PurpleRequestFields *fields) { - + PurpleRequestField *f; GList *l; @@ -5376,7 +5376,7 @@ gc = pd->gc; acct = purple_connection_get_account(gc); - + /* collision checking */ group = purple_find_group(name); if(group) { @@ -5497,7 +5497,7 @@ gc = pd->gc; g_return_if_fail(gc != NULL); - + if(!code && results) { res = results->data; @@ -5537,7 +5537,7 @@ query = g_list_prepend(NULL, (char *) name); flags = mwResolveFlag_FIRST | mwResolveFlag_GROUPS; - + req = mwServiceResolve_resolve(srvc, query, flags, remote_group_resolved, NULL, NULL); g_list_free(query); @@ -5599,7 +5599,7 @@ if(!match->id || !match->name) continue; - + row = g_list_append(row, g_strdup(match->name)); row = g_list_append(row, g_strdup(match->id)); purple_notify_searchresults_row_add(sres, row); @@ -5659,7 +5659,7 @@ pd = gc->proto_data; srvc = pd->srvc_resolve; - + query = g_list_prepend(NULL, (char *) name); flags = mwResolveFlag_FIRST | mwResolveFlag_USERS; @@ -5837,7 +5837,7 @@ get caught here */ log_handler[0] = g_log_set_handler(G_LOG_DOMAIN, logflags, mw_log_handler, NULL); - + /* redirect meanwhile's logging to purple's */ log_handler[1] = g_log_set_handler("meanwhile", logflags, mw_log_handler, NULL); diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/silc/silc.c --- a/libpurple/protocols/silc/silc.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/silc/silc.c Tue Jan 04 06:55:30 2011 +0000 @@ -678,12 +678,12 @@ g_return_if_fail(sg != NULL); ui_info = purple_core_get_ui_info(); - + if(ui_info) { ui_name = g_hash_table_lookup(ui_info, "name"); ui_website = g_hash_table_lookup(ui_info, "website"); } - + if(!ui_name || !ui_website) { ui_name = "Pidgin"; ui_website = PURPLE_WEBSITE; @@ -1845,7 +1845,7 @@ GHashTable *ui_info; const char *ui_name = NULL, *ui_website = NULL; char *quit_msg; - + gc = purple_conversation_get_gc(conv); if (gc == NULL) @@ -1857,12 +1857,12 @@ return PURPLE_CMD_RET_FAILED; ui_info = purple_core_get_ui_info(); - + if(ui_info) { ui_name = g_hash_table_lookup(ui_info, "name"); ui_website = g_hash_table_lookup(ui_info, "website"); } - + if(!ui_name || !ui_website) { ui_name = "Pidgin"; ui_website = PURPLE_WEBSITE; diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/silc10/buddy.c --- a/libpurple/protocols/silc10/buddy.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/silc10/buddy.c Tue Jan 04 06:55:30 2011 +0000 @@ -93,7 +93,7 @@ NULL, NULL, key, a->responder); silc_ske_free_key_material(key); - + /* Open IM window */ convo = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, client_entry->nickname, sg->account); @@ -1739,7 +1739,7 @@ obj.mime = icon = silc_mime_encode(mime, &obj.mime_len); if (obj.mime) - silc_client_attribute_add(client, conn, + silc_client_attribute_add(client, conn, SILC_ATTRIBUTE_USER_ICON, &obj, sizeof(obj)); silc_free(icon); diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/silc10/chat.c --- a/libpurple/protocols/silc10/chat.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/silc10/chat.c Tue Jan 04 06:55:30 2011 +0000 @@ -1065,7 +1065,7 @@ char *silcpurple_get_chat_name(GHashTable *data) { return g_strdup(g_hash_table_lookup(data, "channel")); -} +} void silcpurple_chat_join(PurpleConnection *gc, GHashTable *data) { diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/silc10/ops.c --- a/libpurple/protocols/silc10/ops.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/silc10/ops.c Tue Jan 04 06:55:30 2011 +0000 @@ -124,7 +124,7 @@ if (channel) silc_channel_message(client, conn, sender, channel, - payload, key, + payload, key, SILC_MESSAGE_FLAG_UTF8, data, data_len); else @@ -165,11 +165,11 @@ if (imgid) { cflags |= PURPLE_MESSAGE_IMAGES | PURPLE_MESSAGE_RECV; g_snprintf(tmp, sizeof(tmp), "", imgid); - + if (channel) serv_got_chat_in(gc, purple_conv_chat_get_id(PURPLE_CONV_CHAT(convo)), sender->nickname ? - sender->nickname : + sender->nickname : "", cflags, tmp, time(NULL)); else @@ -364,7 +364,7 @@ memset(enc, 0, sizeof(enc)); if (!silc_mime_parse(message, message_len, NULL, 0, - type, sizeof(type) - 1, enc, sizeof(enc) - 1, &data, + type, sizeof(type) - 1, enc, sizeof(enc) - 1, &data, &data_len)) return; diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/silc10/silc.c --- a/libpurple/protocols/silc10/silc.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/silc10/silc.c Tue Jan 04 06:55:30 2011 +0000 @@ -388,7 +388,7 @@ GHashTable *ui_info; const char *ui_name = NULL, *ui_website = NULL; char *quit_msg; - + g_return_if_fail(sg != NULL); ui_info = purple_core_get_ui_info(); @@ -1557,7 +1557,7 @@ GHashTable *ui_info; const char *ui_name = NULL, *ui_website = NULL; char *quit_msg; - + gc = purple_conversation_get_gc(conv); if (gc == NULL) diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/silc10/util.c --- a/libpurple/protocols/silc10/util.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/silc10/util.c Tue Jan 04 06:55:30 2011 +0000 @@ -635,13 +635,13 @@ return strdup("image/gif"); else if (!g_ascii_strcasecmp(".tiff", ct)) return strdup("image/tiff"); - + return NULL; } -/* Checks if message has images, and assembles MIME message if it has. - If only one image is present, creates simple MIME image message. If - there are multiple images and/or text with images multipart MIME +/* Checks if message has images, and assembles MIME message if it has. + If only one image is present, creates simple MIME image message. If + there are multiple images and/or text with images multipart MIME message is created. */ SilcDList silcpurple_image_message(const char *msg, SilcUInt32 *mflags) @@ -747,7 +747,7 @@ silc_mime_add_field(mime, "MIME-Version", "1.0"); g_snprintf(b, sizeof(b), "b%4X%4X", (unsigned int)time(NULL), - silc_dlist_count(parts)); + silc_dlist_count(parts)); silc_mime_set_multipart(mime, "mixed", b); silc_dlist_start(parts); while ((p = silc_dlist_get(parts)) != SILC_LIST_END) diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/silc10/wb.c --- a/libpurple/protocols/silc10/wb.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/silc10/wb.c Tue Jan 04 06:55:30 2011 +0000 @@ -30,7 +30,7 @@ 2 bytes height 4 bytes brush color 2 bytes brush size - n bytes data + n bytes data Data: @@ -253,8 +253,8 @@ } static void -silcpurple_wb_request(SilcClient client, const unsigned char *message, - SilcUInt32 message_len, SilcClientEntry sender, +silcpurple_wb_request(SilcClient client, const unsigned char *message, + SilcUInt32 message_len, SilcClientEntry sender, SilcChannelEntry channel) { char tmp[128]; @@ -409,8 +409,8 @@ /* Send the message */ if (wbs->type == 0) { /* Private message */ - silc_client_send_private_message(sg->client, sg->conn, - wbs->u.client, + silc_client_send_private_message(sg->client, sg->conn, + wbs->u.client, SILC_MESSAGE_FLAG_DATA, packet->head, len, TRUE); } else if (wbs->type == 1) { @@ -504,8 +504,8 @@ /* Send the message */ if (wbs->type == 0) { /* Private message */ - silc_client_send_private_message(sg->client, sg->conn, - wbs->u.client, + silc_client_send_private_message(sg->client, sg->conn, + wbs->u.client, SILC_MESSAGE_FLAG_DATA, packet->head, len, TRUE); } else if (wbs->type == 1) { diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/simple/simple.c --- a/libpurple/protocols/simple/simple.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/simple/simple.c Tue Jan 04 06:55:30 2011 +0000 @@ -395,7 +395,7 @@ g_strfreev(parts); purple_debug(PURPLE_DEBUG_MISC, "simple", "nonce: %s realm: %s\n", auth->nonce ? auth->nonce : "(null)", - auth->realm ? auth->realm : "(null)"); + auth->realm ? auth->realm : "(null)"); if(auth->realm) { auth->digest_session_key = purple_cipher_http_digest_calculate_session_key( @@ -796,11 +796,11 @@ b->dialog->theirtag = g_strdup(theirtag); b->dialog->callid = g_strdup(callid); - purple_debug_info("simple", "ourtag: %s\n", + purple_debug_info("simple", "ourtag: %s\n", ourtag); - purple_debug_info("simple", "theirtag: %s\n", + purple_debug_info("simple", "theirtag: %s\n", theirtag); - purple_debug_info("simple", "callid: %s\n", + purple_debug_info("simple", "callid: %s\n", callid); g_free(theirtag); g_free(ourtag); @@ -982,7 +982,7 @@ } /* publish status again if our last update is about to expire. */ - if (sip->republish != -1 && + if (sip->republish != -1 && sip->republish < curtime && purple_account_get_bool(sip->account, "dopublish", TRUE)) { @@ -1272,9 +1272,9 @@ isonline = TRUE; - if(isonline) + if(isonline) purple_prpl_got_user_status(sip->account, from, "available", NULL); - else + else purple_prpl_got_user_status(sip->account, from, "offline", NULL); xmlnode_free(pidf); diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/yahoo/libymsg.c --- a/libpurple/protocols/yahoo/libymsg.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/yahoo/libymsg.c Tue Jan 04 06:55:30 2011 +0000 @@ -849,7 +849,7 @@ if (fed_from != from) g_free(fed_from); - + } else if (!g_ascii_strncasecmp(msg, "GAME", strlen("GAME"))) { PurpleBuddy *bud = purple_find_buddy(account, from); @@ -1012,7 +1012,7 @@ break; } purple_debug_info("yahoo", "Message from federated (%d) buddy %s.\n", im->fed, im->fed_from); - + } /* peer session id */ if (im && (pair->key == 11)) { @@ -1217,7 +1217,7 @@ 13, 1, 334, 0); } - + yahoo_packet_send_and_free(pkt, yd); g_free(add_req->id); @@ -1314,7 +1314,7 @@ PurpleAccount *account; GSList *l = pkt->hash; const char *msg = NULL; - + account = purple_connection_get_account(gc); /* Buddy authorized/declined our addition */ @@ -1724,7 +1724,7 @@ purple_debug_info("yahoo", "yahoo status: %d\n", yd->current_status); pkt = yahoo_packet_new(YAHOO_SERVICE_AUTHRESP, yd->current_status, yd->session_id); - + if(yd->cookie_b) { /* send B cookie if we have it */ yahoo_packet_hash(pkt, "ssssssssss", 1, name, @@ -1795,7 +1795,7 @@ purple_debug_info("yahoo","Authentication: In yahoo_auth16_stage2\n"); yd->url_datas = g_slist_remove(yd->url_datas, url_data); - + if (error_message != NULL) { purple_debug_error("yahoo", "Login Failed, unable to retrieve stage 2 url: %s\n", error_message); purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, error_message); @@ -1809,7 +1809,7 @@ int response_no = -1; char *crumb = NULL; char *crypt = NULL; - + if(g_strv_length(splits) > 1) { yd->cookie_b = yahoo_auth16_get_cookie_b(splits[0]); split_data = g_strsplit(splits[1], "\r\n", -1); @@ -4701,7 +4701,7 @@ default: break; } - + yahoo_packet_hash(pkt, "ssssss", 49, "TYPING", 1, purple_connection_get_display_name(gc), 14, " ", 13, state == PURPLE_TYPING ? "1" : "0", 5, fed_who, 1002, "1"); @@ -5106,7 +5106,7 @@ yahoo_packet_hash(pkt, "ssis", 1, purple_connection_get_display_name(gc), 7, who+4, 241, fed, 13, "2"); else yahoo_packet_hash(pkt, "sss", 1, purple_connection_get_display_name(gc), 7, who, 13, "2"); - + yahoo_packet_send_and_free(pkt, yd); } diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/yahoo/util.c --- a/libpurple/protocols/yahoo/util.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/yahoo/util.c Tue Jan 04 06:55:30 2011 +0000 @@ -39,7 +39,7 @@ PurpleProxyInfo *ppi = NULL; PurpleProxyType type = PURPLE_PROXY_NONE; gboolean proxy_ssl = purple_account_get_bool(account, "proxy_ssl", FALSE); - + if(proxy_ssl) ppi = purple_proxy_get_setup(account); else diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/yahoo/yahoo_aliases.c --- a/libpurple/protocols/yahoo/yahoo_aliases.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/yahoo/yahoo_aliases.c Tue Jan 04 06:55:30 2011 +0000 @@ -151,7 +151,7 @@ purple_debug_info("yahoo", "Sent updated alias '%s'\n", buddy_alias); } } - + if (f != NULL) ypd = &f->ypd; else { diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/yahoo/yahoo_friend.c --- a/libpurple/protocols/yahoo/yahoo_friend.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/yahoo/yahoo_friend.c Tue Jan 04 06:55:30 2011 +0000 @@ -152,7 +152,7 @@ char *who = NULL; int value = 0; YahooFederation fed = YAHOO_FEDERATION_NONE; - + while (l) { struct yahoo_pair *pair = l->data; @@ -175,7 +175,7 @@ purple_debug_error("yahoo", "Received unknown value for presence key: %d\n", value); return; } - + switch (fed) { case YAHOO_FEDERATION_MSN: who = g_strconcat("msn/", temp, NULL); @@ -238,12 +238,12 @@ f = yahoo_friend_find(gc, name); if (!f) return; - + if(f->fed != YAHOO_FEDERATION_NONE) temp = name+4; else temp = name; - + /* No need to change the value if it is already correct */ if (f->presence == presence) { purple_debug_info("yahoo", "Not setting presence because there are no changes.\n"); diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/yahoo/yahoochat.c --- a/libpurple/protocols/yahoo/yahoochat.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/yahoo/yahoochat.c Tue Jan 04 06:55:30 2011 +0000 @@ -253,7 +253,7 @@ tmp = g_strdup_printf(_("%s has declined to join."), who); purple_conversation_write(c, NULL, tmp, PURPLE_MESSAGE_SYSTEM | PURPLE_MESSAGE_NO_LINKIFY, time(NULL)); - + g_free(tmp); } diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/ZAsyncLocate.c --- a/libpurple/protocols/zephyr/ZAsyncLocate.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/ZAsyncLocate.c Tue Jan 04 06:55:30 2011 +0000 @@ -5,7 +5,7 @@ * * Copyright (c) 1990,1991 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" @@ -85,7 +85,7 @@ end = notice->z_message+notice->z_message_len; __locate_num = 0; - + for (ptr=notice->z_message;ptrz_auth) return (ZAUTH_NO); - - if ((result = krb_get_cred(SERVER_SERVICE, SERVER_INSTANCE, + + if ((result = krb_get_cred(SERVER_SERVICE, SERVER_INSTANCE, __Zephyr_realm, &cred)) != 0) return (ZAUTH_NO); #ifdef NOENCRYPTION our_checksum = 0; #else - our_checksum = des_quad_cksum(notice->z_packet, NULL, + our_checksum = des_quad_cksum(notice->z_packet, NULL, notice->z_default_format+ strlen(notice->z_default_format)+1- notice->z_packet, 0, (C_Block *)cred.session); @@ -52,4 +52,4 @@ #else return (notice->z_auth ? ZAUTH_YES : ZAUTH_NO); #endif -} +} diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/ZCkIfNot.c --- a/libpurple/protocols/zephyr/ZCkIfNot.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/ZCkIfNot.c Tue Jan 04 06:55:30 2011 +0000 @@ -5,7 +5,7 @@ * * Copyright (c) 1987,1988 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" @@ -23,11 +23,11 @@ if ((retval = Z_ReadEnqueue()) != ZERR_NONE) return (retval); - + qptr = Z_GetFirstComplete(); - + while (qptr) { - if ((retval = ZParseNotice(qptr->packet, qptr->packet_len, + if ((retval = ZParseNotice(qptr->packet, qptr->packet_len, &tmpnotice)) != ZERR_NONE) return (retval); if ((*predicate)(&tmpnotice, args)) { @@ -36,14 +36,14 @@ (void) memcpy(buffer, qptr->packet, qptr->packet_len); if (from) *from = qptr->from; - if ((retval = ZParseNotice(buffer, qptr->packet_len, + if ((retval = ZParseNotice(buffer, qptr->packet_len, notice)) != ZERR_NONE) { free(buffer); return (retval); } Z_RemQueue(qptr); return (ZERR_NONE); - } + } qptr = Z_GetNextComplete(qptr); } diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/ZClosePort.c --- a/libpurple/protocols/zephyr/ZClosePort.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/ZClosePort.c Tue Jan 04 06:55:30 2011 +0000 @@ -5,7 +5,7 @@ * * Copyright (c) 1987 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" @@ -17,6 +17,6 @@ __Zephyr_fd = -1; __Zephyr_open = 0; - + return (ZERR_NONE); } diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/ZCmpUID.c --- a/libpurple/protocols/zephyr/ZCmpUID.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/ZCmpUID.c Tue Jan 04 06:55:30 2011 +0000 @@ -5,7 +5,7 @@ * * Copyright (c) 1987 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/ZCmpUIDP.c --- a/libpurple/protocols/zephyr/ZCmpUIDP.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/ZCmpUIDP.c Tue Jan 04 06:55:30 2011 +0000 @@ -5,7 +5,7 @@ * * Copyright (c) 1987 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/ZFlsLocs.c --- a/libpurple/protocols/zephyr/ZFlsLocs.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/ZFlsLocs.c Tue Jan 04 06:55:30 2011 +0000 @@ -5,7 +5,7 @@ * * Copyright (c) 1987 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" @@ -13,7 +13,7 @@ Code_t ZFlushLocations() { int i; - + if (!__locate_list) return (ZERR_NONE); @@ -22,7 +22,7 @@ free(__locate_list[i].time); free(__locate_list[i].tty); } - + free((char *)__locate_list); __locate_list = 0; diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/ZFlsSubs.c --- a/libpurple/protocols/zephyr/ZFlsSubs.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/ZFlsSubs.c Tue Jan 04 06:55:30 2011 +0000 @@ -5,7 +5,7 @@ * * Copyright (c) 1987 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" @@ -13,7 +13,7 @@ Code_t ZFlushSubscriptions() { register int i; - + if (!__subscriptions_list) return (ZERR_NONE); @@ -22,7 +22,7 @@ free(__subscriptions_list[i].zsub_classinst); free(__subscriptions_list[i].zsub_recipient); } - + free((char *)__subscriptions_list); __subscriptions_list = 0; diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/ZFmtAuth.c --- a/libpurple/protocols/zephyr/ZFmtAuth.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/ZFmtAuth.c Tue Jan 04 06:55:30 2011 +0000 @@ -5,7 +5,7 @@ * Copyright (c) 1987,1988 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/ZFmtList.c --- a/libpurple/protocols/zephyr/ZFmtList.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/ZFmtList.c Tue Jan 04 06:55:30 2011 +0000 @@ -5,12 +5,12 @@ * * Copyright (c) 1987,1991 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" -Code_t ZFormatNoticeList(notice, list, nitems, buffer, ret_len, +Code_t ZFormatNoticeList(notice, list, nitems, buffer, ret_len, cert_routine) ZNotice_t *notice; register char **list; diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/ZFmtNotice.c --- a/libpurple/protocols/zephyr/ZFmtNotice.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/ZFmtNotice.c Tue Jan 04 06:55:30 2011 +0000 @@ -5,7 +5,7 @@ * * Copyright (c) 1987,1988 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" @@ -20,7 +20,7 @@ int hdrlen; Code_t retval; - if ((retval = Z_FormatHeader(notice, header, sizeof(header), &hdrlen, + if ((retval = Z_FormatHeader(notice, header, sizeof(header), &hdrlen, cert_routine)) != ZERR_NONE) return (retval); diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/ZFmtRaw.c --- a/libpurple/protocols/zephyr/ZFmtRaw.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/ZFmtRaw.c Tue Jan 04 06:55:30 2011 +0000 @@ -5,7 +5,7 @@ * * Copyright (c) 1987 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/ZFmtRawLst.c --- a/libpurple/protocols/zephyr/ZFmtRawLst.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/ZFmtRawLst.c Tue Jan 04 06:55:30 2011 +0000 @@ -5,7 +5,7 @@ * * Copyright (c) 1987 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" @@ -31,12 +31,12 @@ size += strlen(list[i])+1; *ret_len = hdrlen+size; - + if (!(*buffer = (char *) malloc((unsigned) *ret_len))) return (ENOMEM); (void) memcpy(*buffer, header, hdrlen); - + ptr = *buffer+hdrlen; for (;nitems;nitems--, list++) { diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/ZFmtSmRLst.c --- a/libpurple/protocols/zephyr/ZFmtSmRLst.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/ZFmtSmRLst.c Tue Jan 04 06:55:30 2011 +0000 @@ -5,7 +5,7 @@ * * Copyright (c) 1988 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/ZFmtSmRaw.c --- a/libpurple/protocols/zephyr/ZFmtSmRaw.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/ZFmtSmRaw.c Tue Jan 04 06:55:30 2011 +0000 @@ -5,7 +5,7 @@ * * Copyright (c) 1987 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" @@ -17,7 +17,7 @@ { Code_t retval; int hdrlen; - + if ((retval = Z_FormatRawHeader(notice, buffer, Z_MAXHEADERLEN, &hdrlen, NULL, NULL)) != ZERR_NONE) return (retval); diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/ZFreeNot.c --- a/libpurple/protocols/zephyr/ZFreeNot.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/ZFreeNot.c Tue Jan 04 06:55:30 2011 +0000 @@ -5,7 +5,7 @@ * * Copyright (c) 1987 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/ZGetLocs.c --- a/libpurple/protocols/zephyr/ZGetLocs.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/ZGetLocs.c Tue Jan 04 06:55:30 2011 +0000 @@ -5,7 +5,7 @@ * * Copyright (c) 1987 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" @@ -18,13 +18,13 @@ Code_t ZGetLocations(ZLocations_t *location, int *numlocs) { int i; - + if (!__locate_list) return (ZERR_NOLOCATIONS); if (__locate_next == __locate_num) return (ZERR_NOMORELOCS); - + for (i=0;ipacket, qptr->packet_len, + if ((retval = ZParseNotice(qptr->packet, qptr->packet_len, &tmpnotice)) != ZERR_NONE) return (retval); if ((*predicate)(&tmpnotice, args)) { @@ -37,7 +37,7 @@ (void) memcpy(buffer, qptr->packet, qptr->packet_len); if (from) *from = qptr->from; - if ((retval = ZParseNotice(buffer, qptr->packet_len, + if ((retval = ZParseNotice(buffer, qptr->packet_len, notice)) != ZERR_NONE) { free(buffer); return (retval); diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/ZInit.c --- a/libpurple/protocols/zephyr/ZInit.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/ZInit.c Tue Jan 04 06:55:30 2011 +0000 @@ -5,7 +5,7 @@ * * Copyright (c) 1987, 1991 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #ifdef ZEPHYR_USES_KERBEROS @@ -49,7 +49,7 @@ #endif initialize_zeph_error_table(); - + (void) memset((char *)&__HM_addr, 0, sizeof(__HM_addr)); __HM_addr.sin_family = AF_INET; @@ -70,7 +70,7 @@ /* Initialize the input queue */ __Q_Tail = NULL; __Q_Head = NULL; - + /* if the application is a server, there might not be a zhm. The code will fall back to something which might not be "right", but this is is ok, since none of the servers call krb_rd_req. */ diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/ZLocations.c --- a/libpurple/protocols/zephyr/ZLocations.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/ZLocations.c Tue Jan 04 06:55:30 2011 +0000 @@ -6,7 +6,7 @@ * * Copyright (c) 1987,1988,1991 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" @@ -21,13 +21,13 @@ Code_t ZSetLocation(exposure) char *exposure; { - return (Z_SendLocation(LOGIN_CLASS, exposure, ZAUTH, + return (Z_SendLocation(LOGIN_CLASS, exposure, ZAUTH, "$sender logged in to $1 on $3 at $2")); } Code_t ZUnsetLocation() { - return (Z_SendLocation(LOGIN_CLASS, LOGIN_USER_LOGOUT, ZNOAUTH, + return (Z_SendLocation(LOGIN_CLASS, LOGIN_USER_LOGOUT, ZNOAUTH, "$sender logged out of $1 on $3 at $2")); } @@ -137,8 +137,8 @@ } ZFreeNotice(&retnotice); return (ZERR_SERVNAK); - } - + } + if (retnotice.z_kind != SERVACK) { ZFreeNotice(&retnotice); return (ZERR_INTERNAL); @@ -156,6 +156,6 @@ } ZFreeNotice(&retnotice); - + return (ZERR_NONE); } diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/ZMakeAscii.c --- a/libpurple/protocols/zephyr/ZMakeAscii.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/ZMakeAscii.c Tue Jan 04 06:55:30 2011 +0000 @@ -5,7 +5,7 @@ * * Copyright (c) 1987 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" @@ -33,7 +33,7 @@ *ptr++ = '0'; *ptr++ = 'x'; len -= 2; - } + } if (len < 3) return ZERR_FIELDLEN; *ptr++ = itox_chars[(int) (field[i] >> 4)]; diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/ZMkAuth.c --- a/libpurple/protocols/zephyr/ZMkAuth.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/ZMkAuth.c Tue Jan 04 06:55:30 2011 +0000 @@ -5,7 +5,7 @@ * * Copyright (c) 1987 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" @@ -50,7 +50,7 @@ now = time(0); if (last_authent_time == 0 || (now - last_authent_time > 120)) { - result = krb_mk_req(&authent, SERVER_SERVICE, + result = krb_mk_req(&authent, SERVER_SERVICE, SERVER_INSTANCE, __Zephyr_realm, 0); if (result != MK_AP_OK) { last_authent_time = 0; @@ -68,9 +68,9 @@ /* zero length authent is an error, so malloc(0) is not a problem */ if (!notice->z_ascii_authent) return (ENOMEM); - if ((result = ZMakeAscii(notice->z_ascii_authent, - authent.length*3, - authent.dat, + if ((result = ZMakeAscii(notice->z_ascii_authent, + authent.length*3, + authent.dat, authent.length)) != ZERR_NONE) { free(notice->z_ascii_authent); return (result); @@ -83,7 +83,7 @@ return(result); /* Compute a checksum over the header and message. */ - if ((result = krb_get_cred(SERVER_SERVICE, SERVER_INSTANCE, + if ((result = krb_get_cred(SERVER_SERVICE, SERVER_INSTANCE, __Zephyr_realm, &cred)) != 0) return result; checksum = des_quad_cksum(buffer, NULL, cstart - buffer, 0, (C_Block *)cred.session); diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/ZNewLocU.c --- a/libpurple/protocols/zephyr/ZNewLocU.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/ZNewLocU.c Tue Jan 04 06:55:30 2011 +0000 @@ -5,7 +5,7 @@ * * Copyright (c) 1987,1988,1991 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/ZOpenPort.c --- a/libpurple/protocols/zephyr/ZOpenPort.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/ZOpenPort.c Tue Jan 04 06:55:30 2011 +0000 @@ -5,7 +5,7 @@ * * Copyright (c) 1987 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" @@ -20,7 +20,7 @@ { struct sockaddr_in bindin; socklen_t len; - + (void) ZClosePort(); if ((__Zephyr_fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { @@ -32,7 +32,7 @@ { int on = 1; - setsockopt(__Zephyr_fd, SOL_SOCKET, SO_BSDCOMPAT, (char *)&on, + setsockopt(__Zephyr_fd, SOL_SOCKET, SO_BSDCOMPAT, (char *)&on, sizeof(on)); } #endif @@ -58,7 +58,7 @@ if (getsockname(__Zephyr_fd, (struct sockaddr *)&bindin, &len)) return (errno); } - + __Zephyr_port = bindin.sin_port; __Zephyr_open = 1; diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/ZParseNot.c --- a/libpurple/protocols/zephyr/ZParseNot.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/ZParseNot.c Tue Jan 04 06:55:30 2011 +0000 @@ -5,7 +5,7 @@ * * Copyright (c) 1987,1991 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" @@ -84,12 +84,12 @@ #endif (void) memset((char *)notice, 0, sizeof(ZNotice_t)); - + ptr = buffer; end = buffer+len; notice->z_packet = buffer; - + notice->z_version = ptr; if (strncmp(ptr, ZVERSIONHDR, sizeof(ZVERSIONHDR) - 1)) return (ZERR_VERS); @@ -141,7 +141,7 @@ } else BAD_PACKET; - + if (numfields) { if (ZReadAscii(ptr, end-ptr, (unsigned char *)¬ice->z_uid, sizeof(ZUnique_Id_t)) == ZERR_BADFIELD) @@ -153,7 +153,7 @@ } else BAD_PACKET; - + if (numfields) { if (ZReadAscii16(ptr, end-ptr, ¬ice->z_port) == ZERR_BADFIELD) BAD_PACKET; @@ -174,7 +174,7 @@ else BAD_PACKET; notice->z_checked_auth = ZAUTH_UNSET; - + if (numfields) { if (ZReadAscii32(ptr, end-ptr, &temp) == ZERR_BADFIELD) BAD_PACKET; @@ -200,7 +200,7 @@ } else notice->z_class = ""; - + if (numfields) { notice->z_class_inst = ptr; numfields--; @@ -240,7 +240,7 @@ } else notice->z_default_format = ""; - + /*XXX*/ if (ZReadAscii32(ptr, end-ptr, &temp) == ZERR_BADFIELD) BAD_PACKET; @@ -273,10 +273,10 @@ next_field (ptr); } notice->z_num_other_fields = i; - + for (i=0;iz_message = (void *)ptr; notice->z_message_len = len-(ptr-buffer); diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/ZPeekIfNot.c --- a/libpurple/protocols/zephyr/ZPeekIfNot.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/ZPeekIfNot.c Tue Jan 04 06:55:30 2011 +0000 @@ -5,7 +5,7 @@ * * Copyright (c) 1987,1988 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" @@ -24,11 +24,11 @@ if ((retval = Z_WaitForComplete()) != ZERR_NONE) return (retval); - + for (;;) { qptr = Z_GetFirstComplete(); while (qptr) { - if ((retval = ZParseNotice(qptr->packet, qptr->packet_len, + if ((retval = ZParseNotice(qptr->packet, qptr->packet_len, &tmpnotice)) != ZERR_NONE) return (retval); if ((*predicate)(&tmpnotice, args)) { @@ -37,7 +37,7 @@ (void) memcpy(buffer, qptr->packet, qptr->packet_len); if (from) *from = qptr->from; - if ((retval = ZParseNotice(buffer, qptr->packet_len, + if ((retval = ZParseNotice(buffer, qptr->packet_len, notice)) != ZERR_NONE) { free(buffer); return (retval); diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/ZPeekNot.c --- a/libpurple/protocols/zephyr/ZPeekNot.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/ZPeekNot.c Tue Jan 04 06:55:30 2011 +0000 @@ -5,7 +5,7 @@ * * Copyright (c) 1987 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" @@ -17,7 +17,7 @@ char *buffer; int len; Code_t retval; - + if ((retval = ZPeekPacket(&buffer, &len, from)) != ZERR_NONE) return (retval); diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/ZPeekPkt.c --- a/libpurple/protocols/zephyr/ZPeekPkt.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/ZPeekPkt.c Tue Jan 04 06:55:30 2011 +0000 @@ -5,7 +5,7 @@ * * Copyright (c) 1987 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" @@ -17,14 +17,14 @@ { Code_t retval; struct _Z_InputQ *nextq; - + if ((retval = Z_WaitForComplete()) != ZERR_NONE) return (retval); nextq =Z_GetFirstComplete(); *ret_len = nextq->packet_len; - + if (!(*buffer = (char *) malloc((unsigned) *ret_len))) return (ENOMEM); @@ -32,6 +32,6 @@ if (from) *from = nextq->from; - + return (ZERR_NONE); } diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/ZPending.c --- a/libpurple/protocols/zephyr/ZPending.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/ZPending.c Tue Jan 04 06:55:30 2011 +0000 @@ -5,7 +5,7 @@ * * Copyright (c) 1987 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" @@ -13,16 +13,16 @@ int ZPending() { int retval; - + if (ZGetFD() < 0) { errno = ZERR_NOPORT; return (-1); } - + if ((retval = Z_ReadEnqueue()) != ZERR_NONE) { errno = retval; return (-1); - } - + } + return(ZQLength()); } diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/ZReadAscii.c --- a/libpurple/protocols/zephyr/ZReadAscii.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/ZReadAscii.c Tue Jan 04 06:55:30 2011 +0000 @@ -5,7 +5,7 @@ * * Copyright (c) 1987, 1990 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" @@ -28,13 +28,13 @@ ptr++; if (--len < 0) return ZERR_BADFIELD; - } + } if (ptr[0] == '0' && ptr[1] == 'x') { ptr += 2; len -= 2; if (len < 0) return ZERR_BADFIELD; - } + } c1 = Z_cnvt_xtoi(ptr[0]); if (c1 < 0) return ZERR_BADFIELD; diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/ZRecvNot.c --- a/libpurple/protocols/zephyr/ZRecvNot.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/ZRecvNot.c Tue Jan 04 06:55:30 2011 +0000 @@ -5,7 +5,7 @@ * * Copyright (c) 1987,1988 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" @@ -28,18 +28,18 @@ return (ENOMEM); len = nextq->packet_len; - + if (!(buffer = (char *) malloc((unsigned) len))) return (ENOMEM); if (from) *from = nextq->from; - + (void) memcpy(buffer, nextq->packet, len); auth = nextq->auth; Z_RemQueue(nextq); - + if ((retval = ZParseNotice(buffer, len, notice)) != ZERR_NONE) return (retval); notice->z_checked_auth = auth; diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/ZRecvPkt.c --- a/libpurple/protocols/zephyr/ZRecvPkt.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/ZRecvPkt.c Tue Jan 04 06:55:30 2011 +0000 @@ -5,7 +5,7 @@ * * Copyright (c) 1987,1988 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" @@ -17,7 +17,7 @@ { Code_t retval; struct _Z_InputQ *nextq; - + if ((retval = Z_WaitForComplete()) != ZERR_NONE) return (retval); @@ -26,12 +26,12 @@ *ret_len = nextq->packet_len; if (*ret_len > Z_MAXPKTLEN) return (ZERR_PKTLEN); - + (void) memcpy(buffer, nextq->packet, *ret_len); if (from) *from = nextq->from; - + Z_RemQueue(nextq); return (ZERR_NONE); diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/ZRetSubs.c --- a/libpurple/protocols/zephyr/ZRetSubs.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/ZRetSubs.c Tue Jan 04 06:55:30 2011 +0000 @@ -6,7 +6,7 @@ * * Copyright (c) 1987,1988,1991 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" @@ -25,7 +25,7 @@ int retval; ZNotice_t notice; char asciiport[50]; - + if (!port) /* use default port */ port = __Zephyr_port; @@ -102,7 +102,7 @@ if (retnotice.z_kind == SERVNAK) { ZFreeNotice(&retnotice); return (ZERR_SERVNAK); - } + } /* non-matching protocol version numbers means the server is probably an older version--must punt */ if (strcmp(notice->z_version,retnotice.z_version)) { @@ -114,7 +114,7 @@ ZFreeNotice(&retnotice); gimmeack = 1; continue; - } + } if (retnotice.z_kind != ACKED) { ZFreeNotice(&retnotice); diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/ZSendList.c --- a/libpurple/protocols/zephyr/ZSendList.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/ZSendList.c Tue Jan 04 06:55:30 2011 +0000 @@ -5,7 +5,7 @@ * * Copyright (c) 1987 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" @@ -31,13 +31,13 @@ char *buffer; int len; - if ((retval = ZFormatNoticeList(notice, list, nitems, &buffer, + if ((retval = ZFormatNoticeList(notice, list, nitems, &buffer, &len, cert_routine)) != ZERR_NONE) return (retval); if ((retval = ZParseNotice(buffer, len, &newnotice)) != ZERR_NONE) return (retval); - + retval = Z_SendFragmentedNotice(&newnotice, len, cert_routine, send_routine); diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/ZSendNot.c --- a/libpurple/protocols/zephyr/ZSendNot.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/ZSendNot.c Tue Jan 04 06:55:30 2011 +0000 @@ -5,7 +5,7 @@ * * Copyright (c) 1987 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" @@ -21,19 +21,19 @@ ZNotice_t *notice; Z_AuthProc cert_routine; Code_t (*send_routine)(); -{ +{ Code_t retval; ZNotice_t newnotice; char *buffer; int len; - if ((retval = ZFormatNotice(notice, &buffer, &len, + if ((retval = ZFormatNotice(notice, &buffer, &len, cert_routine)) != ZERR_NONE) return (retval); if ((retval = ZParseNotice(buffer, len, &newnotice)) != ZERR_NONE) return (retval); - + retval = Z_SendFragmentedNotice(&newnotice, len, cert_routine, send_routine); diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/ZSendPkt.c --- a/libpurple/protocols/zephyr/ZSendPkt.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/ZSendPkt.c Tue Jan 04 06:55:30 2011 +0000 @@ -5,7 +5,7 @@ * * Copyright (c) 1987,1991 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" @@ -25,19 +25,19 @@ Code_t retval; struct sockaddr_in dest; ZNotice_t notice, acknotice; - + if (!packet || len < 0) return (ZERR_ILLVAL); if (len > Z_MAXPKTLEN) return (ZERR_PKTLEN); - + if (ZGetFD() < 0) if ((retval = ZOpenPort((unsigned short *)0)) != ZERR_NONE) return (retval); dest = ZGetDestAddr(); - + if (sendto(ZGetFD(), packet, len, 0, (struct sockaddr *)&dest, sizeof(dest)) < 0) return (errno); @@ -47,7 +47,7 @@ if ((retval = ZParseNotice(packet, len, ¬ice)) != ZERR_NONE) return (retval); - + retval = Z_WaitForNotice (&acknotice, wait_for_hmack, ¬ice.z_uid, HM_TIMEOUT); if (retval == ETIMEDOUT) diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/ZSendRLst.c --- a/libpurple/protocols/zephyr/ZSendRLst.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/ZSendRLst.c Tue Jan 04 06:55:30 2011 +0000 @@ -5,7 +5,7 @@ * * Copyright (c) 1988 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" @@ -30,13 +30,13 @@ char *buffer; int len; - if ((retval = ZFormatRawNoticeList(notice, list, nitems, &buffer, + if ((retval = ZFormatRawNoticeList(notice, list, nitems, &buffer, &len)) != ZERR_NONE) return (retval); if ((retval = ZParseNotice(buffer, len, &newnotice)) != ZERR_NONE) return (retval); - + retval = Z_SendFragmentedNotice(&newnotice, len, NULL, send_routine); free(buffer); diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/ZSendRaw.c --- a/libpurple/protocols/zephyr/ZSendRaw.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/ZSendRaw.c Tue Jan 04 06:55:30 2011 +0000 @@ -5,7 +5,7 @@ * * Copyright (c) 1987 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" @@ -25,7 +25,7 @@ if ((retval = ZParseNotice(buffer, len, &newnotice)) != ZERR_NONE) return (retval); - + retval = Z_SendFragmentedNotice(&newnotice, len, NULL, Z_XmitFragment); free(buffer); diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/ZSetDest.c --- a/libpurple/protocols/zephyr/ZSetDest.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/ZSetDest.c Tue Jan 04 06:55:30 2011 +0000 @@ -5,7 +5,7 @@ * * Copyright (c) 1987 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" @@ -16,6 +16,6 @@ __HM_addr = *addr; __HM_set = 1; - + return (ZERR_NONE); } diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/ZSetFD.c --- a/libpurple/protocols/zephyr/ZSetFD.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/ZSetFD.c Tue Jan 04 06:55:30 2011 +0000 @@ -5,7 +5,7 @@ * * Copyright (c) 1987 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" @@ -17,6 +17,6 @@ __Zephyr_fd = fd; __Zephyr_open = 0; - + return (ZERR_NONE); } diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/ZSetSrv.c --- a/libpurple/protocols/zephyr/ZSetSrv.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/ZSetSrv.c Tue Jan 04 06:55:30 2011 +0000 @@ -5,7 +5,7 @@ * * Copyright (c) 1987 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" @@ -14,6 +14,6 @@ int state; { __Zephyr_server = state; - + return (ZERR_NONE); } diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/ZSubs.c --- a/libpurple/protocols/zephyr/ZSubs.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/ZSubs.c Tue Jan 04 06:55:30 2011 +0000 @@ -6,7 +6,7 @@ * * Copyright (c) 1987,1988 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" @@ -76,7 +76,7 @@ /* nitems = 0 means cancel all subscriptions; still need to allocate a */ /* array for one item so we can cancel, however. */ - + list = (char **)malloc((unsigned)((nitems==0)?1:nitems)*3*sizeof(char *)); if (!list) return (ENOMEM); @@ -173,10 +173,10 @@ retval = ZSendList(notice, lyst, num*3, ZAUTH); if (retval != ZERR_NONE && !authit) retval = ZSendList(notice, lyst, num*3, ZNOAUTH); - + if (retval != ZERR_NONE) return (retval); - if ((retval = ZIfNotice(&retnotice, (struct sockaddr_in *)0, + if ((retval = ZIfNotice(&retnotice, (struct sockaddr_in *)0, ZCompareUIDPred, (char *)¬ice->z_uid)) != ZERR_NONE) return (retval); diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/ZVariables.c --- a/libpurple/protocols/zephyr/ZVariables.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/ZVariables.c Tue Jan 04 06:55:30 2011 +0000 @@ -6,7 +6,7 @@ * * Copyright (c) 1987 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "libpurple/internal.h" @@ -55,12 +55,12 @@ char *varfile, *varfilebackup, varbfr[512]; written = 0; - + if ((varfile = get_localvarfile()) == NULL) return (ZERR_INTERNAL); varfilebackup = g_strconcat(varfile, ".backup", NULL); - + if (!(fpout = fopen(varfilebackup, "w"))) { g_free(varfile); g_free(varfilebackup); @@ -78,7 +78,7 @@ fprintf(fpout, "%s\n", varbfr); } (void) fclose(fpin); /* don't care about errs on input */ - } + } if (!written) fprintf(fpout, "%s = %s\n", var, value); if (fclose(fpout) == EOF) { @@ -94,7 +94,7 @@ g_free(varfilebackup); g_free(varfile); return (ZERR_NONE); -} +} Code_t ZUnsetVariable(var) char *var; @@ -106,7 +106,7 @@ return (ZERR_INTERNAL); varfilebackup = g_strconcat(varfile, ".backup", NULL); - + if (!(fpout = fopen(varfilebackup, "w"))) { g_free(varfile); g_free(varfilebackup); @@ -120,7 +120,7 @@ fprintf(fpout, "%s\n", varbfr); } (void) fclose(fpin); /* don't care about read close errs */ - } + } if (fclose(fpout) == EOF) { g_free(varfilebackup); g_free(varfile); @@ -134,7 +134,7 @@ g_free(varfilebackup); g_free(varfile); return (ZERR_NONE); -} +} static char *get_localvarfile(void) { @@ -146,7 +146,7 @@ base = getenv("HOME"); if (!base) base = getenv("HOMEPATH"); - if (!base) + if (!base) base = "C:\\"; #endif if (!base) { @@ -160,8 +160,8 @@ } return g_strconcat(base, "/.zephyr.vars", NULL); -} - +} + static char *get_varval(fn, var) char *fn; char *var; @@ -169,7 +169,7 @@ FILE *fp; static char varbfr[512]; int i; - + fp = fopen(fn, "r"); if (!fp) return ((char *)0); @@ -193,11 +193,11 @@ char *var; { register char *cp; - + if (!bfr[0] || bfr[0] == '#') /* comment or null line */ return (0); - + cp = bfr; while (*cp && !isspace(*cp) && (*cp != '=')) cp++; diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/ZWait4Not.c --- a/libpurple/protocols/zephyr/ZWait4Not.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/ZWait4Not.c Tue Jan 04 06:55:30 2011 +0000 @@ -4,7 +4,7 @@ * * Copyright (c) 1991 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/ZhmStat.c --- a/libpurple/protocols/zephyr/ZhmStat.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/ZhmStat.c Tue Jan 04 06:55:30 2011 +0000 @@ -5,7 +5,7 @@ * * Copyright (c) 1996 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" @@ -53,7 +53,7 @@ req.z_recipient = ""; req.z_default_format = ""; req.z_message_len = 0; - + if ((code = ZSetDestAddr(&sin)) != ZERR_NONE) return(code); diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/Zinternal.c --- a/libpurple/protocols/zephyr/Zinternal.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/Zinternal.c Tue Jan 04 06:55:30 2011 +0000 @@ -6,7 +6,7 @@ * Copyright (c) 1987,1988,1991 by the Massachusetts Institute of * Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" @@ -25,7 +25,7 @@ p->tv_sec= (long)((_now.ns100-(116444736000000000LL))/10000000LL); return 0; } -#endif +#endif #else #include @@ -151,7 +151,7 @@ FD_ZERO(&read); FD_SET(ZGetFD(), &read); return (select(ZGetFD() + 1, &read, NULL, NULL, &tv)); -} +} /* Wait for a complete notice to become available */ @@ -179,7 +179,7 @@ if (ZGetFD() < 0) return (ZERR_NOPORT); - + while (Z_PacketWaiting()) if ((retval = Z_ReadWait()) != ZERR_NONE) return (retval); @@ -238,7 +238,7 @@ if (ZGetFD() < 0) return (ZERR_NOPORT); - + FD_ZERO(&fds); FD_SET(ZGetFD(), &fds); tv.tv_sec = 60; @@ -251,7 +251,7 @@ from_len = sizeof(struct sockaddr_in); - packet_len = recvfrom(ZGetFD(), packet, sizeof(packet), 0, + packet_len = recvfrom(ZGetFD(), packet, sizeof(packet), 0, (struct sockaddr *)&from, &from_len); if (packet_len < 0) @@ -265,7 +265,7 @@ if (packet_len < zvlen || memcmp(packet, ZVERSIONHDR, zvlen) != 0) { Z_discarded_packets++; return (ZERR_NONE); - } + } /* Parse the notice */ if ((retval = ZParseNotice(packet, packet_len, ¬ice)) != ZERR_NONE) @@ -393,13 +393,13 @@ if (!__Q_Head) __Q_Head = qptr; - + /* Copy the from field, multiuid, kind, and checked authentication. */ qptr->from = from; qptr->uid = notice.z_multiuid; qptr->kind = notice.z_kind; qptr->auth = notice.z_checked_auth; - + /* * If this is the first part of the notice, we take the header * from it. We only take it if this is the first fragment so that @@ -486,7 +486,7 @@ (void) gettimeofday(&tv, (struct timezone *)0); qptr->timep = tv.tv_sec; - + last = part+notice->z_message_len-1; hole = qptr->holelist; @@ -578,7 +578,7 @@ (void) memcpy(qptr->packet+qptr->header_len, qptr->msg, qptr->msg_len); } - + return (ZERR_NONE); } @@ -610,11 +610,11 @@ } notice->z_multinotice = ""; - + (void) gettimeofday(¬ice->z_uid.tv, (struct timezone *)0); notice->z_uid.tv.tv_sec = htonl((unsigned long) notice->z_uid.tv.tv_sec); notice->z_uid.tv.tv_usec = htonl((unsigned long) notice->z_uid.tv.tv_usec); - + (void) memcpy(¬ice->z_uid.zuid_addr, &__My_addr, sizeof(__My_addr)); notice->z_multiuid = notice->z_uid; @@ -642,10 +642,10 @@ return (Z_FormatRawHeader(notice, buffer, buffer_len, len, NULL, NULL)); } - + return ((*cert_routine)(notice, buffer, buffer_len, len)); -} - +} + Code_t Z_FormatRawHeader(notice, buffer, buffer_len, len, cstart, cend) ZNotice_t *notice; char *buffer; @@ -690,7 +690,7 @@ return (ZERR_HEADERLEN); ptr += strlen(ptr)+1; - if (ZMakeAscii(ptr, end-ptr, (unsigned char *)¬ice->z_uid, + if (ZMakeAscii(ptr, end-ptr, (unsigned char *)¬ice->z_uid, sizeof(ZUnique_Id_t)) == ZERR_FIELDLEN) return (ZERR_HEADERLEN); ptr += strlen(ptr)+1; @@ -728,7 +728,7 @@ (void) sprintf(newrecip, "%s@%s", notice->z_recipient, __Zephyr_realm); if (Z_AddField(&ptr, newrecip, end)) return (ZERR_HEADERLEN); - } + } if (Z_AddField(&ptr, notice->z_default_format, end)) return (ZERR_HEADERLEN); @@ -744,17 +744,17 @@ if (Z_AddField(&ptr, notice->z_multinotice, end)) return (ZERR_HEADERLEN); - if (ZMakeAscii(ptr, end-ptr, (unsigned char *)¬ice->z_multiuid, + if (ZMakeAscii(ptr, end-ptr, (unsigned char *)¬ice->z_multiuid, sizeof(ZUnique_Id_t)) == ZERR_FIELDLEN) return (ZERR_HEADERLEN); ptr += strlen(ptr)+1; - + for (i=0;iz_num_other_fields;i++) if (Z_AddField(&ptr, notice->z_other_fields[i], end)) return (ZERR_HEADERLEN); - + *len = ptr-buffer; - + return (ZERR_NONE); } @@ -808,39 +808,39 @@ struct _Z_InputQ *qptr; { struct _Z_Hole *hole, *nexthole; - + if (qptr->complete) __Q_CompleteLength--; __Q_Size -= qptr->msg_len; - + if (qptr->header) free(qptr->header); if (qptr->msg) free(qptr->msg); if (qptr->packet) free(qptr->packet); - + hole = qptr->holelist; while (hole) { nexthole = hole->next; free((char *)hole); hole = nexthole; } - + if (qptr == __Q_Head && __Q_Head == __Q_Tail) { free ((char *)qptr); __Q_Head = (struct _Z_InputQ *)0; __Q_Tail = (struct _Z_InputQ *)0; return; } - + if (qptr == __Q_Head) { __Q_Head = qptr->next; __Q_Head->prev = (struct _Z_InputQ *)0; free ((char *)qptr); return; - } + } if (qptr == __Q_Tail) { __Q_Tail = qptr->prev; __Q_Tail->next = (struct _Z_InputQ *)0; @@ -864,15 +864,15 @@ char multi[64]; int offset, hdrsize, fragsize, ret_len, message_len, waitforack; Code_t retval; - + hdrsize = len-notice->z_message_len; fragsize = Z_MAXPKTLEN-hdrsize-Z_FRAGFUDGE; - + offset = 0; waitforack = ((notice->z_kind == UNACKED || notice->z_kind == ACKED) && !__Zephyr_server); - + partnotice = *notice; while (offset < notice->z_message_len || !notice->z_message_len) { @@ -885,7 +885,7 @@ htonl((unsigned long) partnotice.z_uid.tv.tv_sec); partnotice.z_uid.tv.tv_usec = htonl((unsigned long) partnotice.z_uid.tv.tv_usec); - (void) memcpy((char *)&partnotice.z_uid.zuid_addr, &__My_addr, + (void) memcpy((char *)&partnotice.z_uid.zuid_addr, &__My_addr, sizeof(__My_addr)); } message_len = min(notice->z_message_len-offset, fragsize); diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/protocols/zephyr/zephyr.c --- a/libpurple/protocols/zephyr/zephyr.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/zephyr/zephyr.c Tue Jan 04 06:55:30 2011 +0000 @@ -9,7 +9,7 @@ * * Some code borrowed from kzephyr, by * Chris Colohan - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -98,9 +98,9 @@ int num_children; }; -parse_tree null_parse_tree = { - "", - {NULL}, +parse_tree null_parse_tree = { + "", + {NULL}, 0, }; @@ -175,7 +175,7 @@ ZSubscription_t sub; sub.zsub_class = class; sub.zsub_classinst = instance; - sub.zsub_recipient = recipient; + sub.zsub_recipient = recipient; ret_val = ZSubscribeTo(&sub,1,0); } } @@ -188,7 +188,7 @@ static char *zephyr_strip_local_realm(zephyr_account* zephyr,const char* user){ /* - Takes in a username of the form username or username@realm + Takes in a username of the form username or username@realm and returns: username, if there is no realm, or the realm is the local realm or: @@ -255,9 +255,9 @@ /* returns true if zt1 is a subset of zt2. This function is used to determine whether a zephyr sent to zt1 should be placed in the chat with triple zt2 - - zt1 is a subset of zt2 - iff. the classnames are identical ignoring case + + zt1 is a subset of zt2 + iff. the classnames are identical ignoring case AND. the instance names are identical (ignoring case), or zt2->instance is *. AND. the recipient names are identical */ @@ -266,7 +266,7 @@ { if (!zt2) { - purple_debug_error("zephyr","zt2 doesn't exist\n"); + purple_debug_error("zephyr","zt2 doesn't exist\n"); return FALSE; } if (!zt1) { @@ -339,7 +339,7 @@ return NULL; } -/* +/* Converts strings to utf-8 if necessary using user specified encoding */ @@ -362,7 +362,7 @@ } } -/* This parses HTML formatting (put out by one of the gtkimhtml widgets +/* This parses HTML formatting (put out by one of the gtkimhtml widgets And converts it to zephyr formatting. It currently deals properly with ,
, , , , It ignores @@ -801,19 +801,19 @@ } for (; nlocs > 0; nlocs--) { /* XXX add real error reporting */ - + ZGetLocations(&locs, &one); - tmp = g_strdup_printf(_("
At %s since %s"), locs.host, locs.time); + tmp = g_strdup_printf(_("
At %s since %s"), locs.host, locs.time); purple_notify_user_info_add_pair(user_info, _("Location"), tmp); g_free(tmp); } - purple_notify_userinfo(gc, (b ? bname : user), + purple_notify_userinfo(gc, (b ? bname : user), user_info, NULL, NULL); purple_notify_user_info_destroy(user_info); } else { - if (nlocs>0) + if (nlocs>0) purple_prpl_got_user_status(gc->account, b ? bname : user, "available", NULL); - else + else purple_prpl_got_user_status(gc->account, b ? bname : user, "offline", NULL); } @@ -825,7 +825,7 @@ PurpleConversation *gconv1; PurpleConvChat *gcc; char *ptr = (char *) notice.z_message + (strlen(notice.z_message) + 1); - int len; + int len; char *stripped_sender; int signature_length = strlen(notice.z_message); int message_has_no_body = 0; @@ -839,7 +839,7 @@ len = 0; purple_debug_info("zephyr","message_size %d %d %d\n",len,notice.z_message_len,signature_length); buf3 = g_strdup(""); - + } else { len = notice.z_message_len - ( signature_length +1); purple_debug_info("zephyr","message_size %d %d %d\n",len,notice.z_message_len,signature_length); @@ -856,11 +856,11 @@ stripped_sender = zephyr_strip_local_realm(zephyr,notice.z_sender); - if (!g_ascii_strcasecmp(notice.z_class, "MESSAGE") && !g_ascii_strcasecmp(notice.z_class_inst, "PERSONAL") + if (!g_ascii_strcasecmp(notice.z_class, "MESSAGE") && !g_ascii_strcasecmp(notice.z_class_inst, "PERSONAL") && !g_ascii_strcasecmp(notice.z_recipient,zephyr->username)) { if (!g_ascii_strcasecmp(notice.z_message, "Automated reply:")) flags |= PURPLE_MESSAGE_AUTO_RESP; - + if (!g_ascii_strcasecmp(notice.z_opcode,"PING")) serv_got_typing(gc,stripped_sender,ZEPHYR_TYPING_RECV_TIMEOUT, PURPLE_TYPING); else @@ -876,8 +876,8 @@ /* This is a server supplied subscription */ zephyr->subscrips = g_slist_append(zephyr->subscrips, new_triple(zephyr,zt1->class,zt1->instance,zt1->recipient)); zt2 = find_sub_by_triple(gc->proto_data,zt1); - } - + } + if (!zt2->open) { zt2->open = TRUE; serv_got_joined_chat(gc, zt2->id, zt2->name); @@ -936,7 +936,7 @@ } } if ((tree != &null_parse_tree) && (tree->contents != NULL)) - g_free(tree->contents); + g_free(tree->contents); } return 0; @@ -954,7 +954,7 @@ { gchar* tc; - if (!ptree || ! key) + if (!ptree || ! key) return &null_parse_tree; tc = tree_child(ptree,0)->contents; @@ -976,7 +976,7 @@ } static parse_tree *parse_buffer(gchar* source, gboolean do_parse) { - + parse_tree *ptree = g_new0(parse_tree,1); ptree->contents = NULL; ptree->num_children=0; @@ -991,7 +991,7 @@ p++; continue; } - + /* Skip comments */ if(source[p] == ';') { while(source[p] != '\n' && p < strlen(source)) { @@ -999,7 +999,7 @@ } continue; } - + if(source[p] == '(') { int nesting = 0; gboolean in_quote = FALSE; @@ -1036,12 +1036,12 @@ p++; } else { end_char = ' '; - } + } do_parse = FALSE; end = p; while(source[end] != end_char && end < strlen(source)) { - if(source[end] == '\\') + if(source[end] == '\\') end++; end++; } @@ -1136,16 +1136,16 @@ /* g_free(zsig); */ g_free(buf); /* free_parse_tree(msgnode); - free_parse_tree(bodynode); + free_parse_tree(bodynode); g_free(msg); g_free(zsig); - g_free(buf); + g_free(buf); */ } else if (!g_ascii_strncasecmp(spewtype,"zlocation",9)) { /* check_loc or zephyr_zloc respectively */ /* XXX fix */ - char *user; + char *user; PurpleBuddy *b; const char *bname; int nlocs = 0; @@ -1166,7 +1166,7 @@ } else { nlocs = 1; } - + bname = b ? purple_buddy_get_name(b) : NULL; if ((b && pending_zloc(zephyr,bname)) || pending_zloc(zephyr,user) || pending_zloc(zephyr,local_zephyr_normalize(zephyr,user))){ PurpleNotifyUserInfo *user_info = purple_notify_user_info_new(); @@ -1193,9 +1193,9 @@ user_info, NULL, NULL); purple_notify_user_info_destroy(user_info); } else { - if (nlocs>0) + if (nlocs>0) purple_prpl_got_user_status(gc->account, b ? bname : user, "available", NULL); - else + else purple_prpl_got_user_status(gc->account, b ? bname : user, "offline", NULL); } } @@ -1210,7 +1210,7 @@ } } else { } - + free_parse_tree(newparsetree); return TRUE; } @@ -1319,9 +1319,9 @@ int i; for(i=0;i0) + if (nlocs>0) purple_prpl_got_user_status(account,name,"available",NULL); - else + else purple_prpl_got_user_status(account,name,"offline",NULL); } } @@ -1330,7 +1330,7 @@ g_free(ald.user); g_free(ald.version); #endif /* WIN32 */ - } else + } else if (use_tzc(zephyr)) { gchar *zlocstr = g_strdup_printf("((tzcfodder . zlocate) \"%s\")\n",chk); size_t len = strlen(zlocstr); @@ -1381,14 +1381,14 @@ { /* XXX This code may not be Win32 clean */ struct hostent *hent; - + if (gethostname(zephyr->ourhost, sizeof(zephyr->ourhost)) == -1) { purple_debug_error("zephyr", "unable to retrieve hostname, %%host%% and %%canon%% will be wrong in subscriptions and have been set to unknown\n"); g_strlcpy(zephyr->ourhost, "unknown", sizeof(zephyr->ourhost)); g_strlcpy(zephyr->ourhostcanon, "unknown", sizeof(zephyr->ourhostcanon)); return; } - + if (!(hent = gethostbyname(zephyr->ourhost))) { purple_debug_error("zephyr", "unable to resolve hostname, %%canon%% will be wrong in subscriptions.and has been set to the value of %%host%%, %s\n",zephyr->ourhost); g_strlcpy(zephyr->ourhostcanon, zephyr->ourhost, sizeof(zephyr->ourhostcanon)); @@ -1402,7 +1402,7 @@ static void process_zsubs(zephyr_account *zephyr) { - /* Loads zephyr chats "(subscriptions) from ~/.zephyr.subs, and + /* Loads zephyr chats "(subscriptions) from ~/.zephyr.subs, and registers (subscribes to) them on the server */ /* XXX deal with unsubscriptions */ @@ -1467,7 +1467,7 @@ } else { z_class = g_strdup(triple[0]); } - + if (!g_ascii_strcasecmp(triple[1],"%host%")) { z_instance = g_strdup(zephyr->ourhost); } else if (!g_ascii_strcasecmp(triple[1],"%canon%")) { @@ -1520,7 +1520,7 @@ if (!(b = purple_find_buddy(gc->account,stripped_user))){ b = purple_buddy_new(gc->account, stripped_user, NULL); purple_blist_add_buddy(b, NULL, g, NULL); - } + } g_free(stripped_user); } } @@ -1552,20 +1552,20 @@ { PurpleConnection *gc; zephyr_account *zephyr; - gboolean read_anyone; - gboolean read_zsubs; + gboolean read_anyone; + gboolean read_zsubs; gchar *exposure; gc = purple_account_get_connection(account); read_anyone = purple_account_get_bool(gc->account,"read_anyone",TRUE); read_zsubs = purple_account_get_bool(gc->account,"read_zsubs",TRUE); - exposure = (gchar *)purple_account_get_string(gc->account, "exposure_level", EXPOSE_REALMVIS); + exposure = (gchar *)purple_account_get_string(gc->account, "exposure_level", EXPOSE_REALMVIS); #ifdef WIN32 username = purple_account_get_username(account); #endif gc->flags |= PURPLE_CONNECTION_AUTO_RESP | PURPLE_CONNECTION_HTML | PURPLE_CONNECTION_NO_BGCOLOR | PURPLE_CONNECTION_NO_URLDESC; - gc->proto_data = zephyr=g_new0(zephyr_account,1); + gc->proto_data = zephyr=g_new0(zephyr_account,1); zephyr->account = account; @@ -1589,9 +1589,9 @@ purple_debug_error("zephyr", "pipe creation failed. killing\n"); exit(-1); } - + pid = fork(); - + if (pid == -1) { purple_debug_error("zephyr", "forking failed\n"); exit(-1); @@ -1618,10 +1618,10 @@ if (close(zephyr->totzc[0]) == -1) { exit(-1); } - /* tzc_command should really be of the form + /* tzc_command should really be of the form path/to/tzc -e %s or - ssh username@hostname pathtotzc -e %s + ssh username@hostname pathtotzc -e %s -- this should not require a password, and ideally should be kerberized ssh -- or fsh username@hostname pathtotzc -e %s @@ -1631,7 +1631,7 @@ /* fprintf(stderr,"replacing %%s with %s\n",zephyr->exposure); */ tzc_cmd_array[i] = g_strdup(zephyr->exposure); found_ps = TRUE; - + } else { /* fprintf(stderr,"keeping %s\n",tzc_cmd_array[i]); */ } @@ -1712,24 +1712,24 @@ while(ptr < bufcur) { if (*ptr == '(') { - parenlevel++; + parenlevel++; } else if (*ptr == ')') { parenlevel--; } purple_debug_info("zephyr","tzc parenlevel is %d\n",parenlevel); switch (parenlevel) { - case 0: + case 0: break; case 1: /* Search for next beginning (, or for the ending */ ptr++; - while((*ptr != '(') && (*ptr != ')') && (ptr = bufcur) + if (ptr >= bufcur) purple_debug_error("zephyr","tzc parsing error\n"); break; - case 2: + case 2: /* You are probably at (foo . bar ) or (foo . "bar") or (foo . chars) or (foo . numbers) or (foo . () ) Parse all the data between the first and last f, and move past ) @@ -1749,9 +1749,9 @@ } } purple_debug_info("zephyr","tempstr parsed\n"); - /* tempstr should now be a tempstridx length string containing all characters + /* tempstr should now be a tempstridx length string containing all characters from that after the first ( to the one before the last paren ). */ - /* We should have the following possible lisp strings but we don't care + /* We should have the following possible lisp strings but we don't care (tzcspew . start) (version . "something") (pid . number)*/ /* We care about 'zephyrid . "username@REALM.NAME"' and 'exposure . "SOMETHING"' */ tempstridx=0; @@ -1766,9 +1766,9 @@ tempstridx++; while(tempstr[tempstridx] !='"' && tempstridx < 20000) username[username_idx++]=tempstr[tempstridx++]; - + zephyr->username = g_strdup_printf("%s",username); - if ((realm = strchr(username,'@'))) + if ((realm = strchr(username,'@'))) zephyr->realm = g_strdup_printf("%s",realm+1); else { realm = (gchar *)purple_account_get_string(gc->account,"realm",""); @@ -1781,12 +1781,12 @@ /* else { zephyr->realm = g_strdup("local-realm"); }*/ - + g_free(username); } else { purple_debug_info("zephyr", "something that's not zephyr id found %s\n",tempstr); } - + /* We don't care about anything else yet */ g_free(tempstr); break; @@ -1850,8 +1850,8 @@ zephyr->nottimer = purple_timeout_add(100, check_notify_zeph02, gc); } else if (use_tzc(zephyr)) { zephyr->nottimer = purple_timeout_add(100, check_notify_tzc, gc); - } - zephyr->loctimer = purple_timeout_add_seconds(20, check_loc, gc); + } + zephyr->loctimer = purple_timeout_add_seconds(20, check_loc, gc); } @@ -1881,7 +1881,7 @@ char *zclass, *zinst, *zrecip; zt = s->data; triple = g_strsplit(zt->name, ",", 3); - + /* deal with classes */ if (!g_ascii_strcasecmp(triple[0],zephyr->ourhost)) { zclass = g_strdup("%host%"); @@ -1913,7 +1913,7 @@ } fprintf(fd, "%s,%s,%s\n",zclass,zinst,zrecip); - + g_free(zclass); g_free(zinst); g_free(zrecip); @@ -1995,7 +1995,7 @@ int err=errno; if (err==EINVAL) { purple_debug_error("zephyr","An invalid signal was specified when killing tzc\n"); - } + } else if (err==ESRCH) { purple_debug_error("zephyr","Tzc's pid didn't exist while killing tzc\n"); } @@ -2009,7 +2009,7 @@ } } -static int zephyr_send_message(zephyr_account *zephyr,char* zclass, char* instance, char* recipient, const char *im, +static int zephyr_send_message(zephyr_account *zephyr,char* zclass, char* instance, char* recipient, const char *im, const char *sig, char *opcode) ; static const char * zephyr_get_signature(void) @@ -2067,7 +2067,7 @@ } zephyr_send_message(zephyr,"MESSAGE","PERSONAL",local_zephyr_normalize(zephyr,who),im,sig,""); - return 1; + return 1; } /* Munge the outgoing zephyr so that any quotes or backslashes are @@ -2091,7 +2091,7 @@ newmsg[pos2]='\\'; newmsg[pos2+1]='"'; pos2+=2; - } + } else { newmsg[pos2] = message[pos]; pos2++; @@ -2128,13 +2128,13 @@ return newmsg; } -static int zephyr_send_message(zephyr_account *zephyr,char* zclass, char* instance, char* recipient, const char *im, - const char *sig, char *opcode) +static int zephyr_send_message(zephyr_account *zephyr,char* zclass, char* instance, char* recipient, const char *im, + const char *sig, char *opcode) { - /* (From the tzc source) + /* (From the tzc source) * emacs sends something of the form: - * ((class . "MESSAGE") + * ((class . "MESSAGE") * (auth . t) * (recipients ("PERSONAL" . "bovik") ("test" . "")) * (sender . "bovik") @@ -2169,7 +2169,7 @@ ZNotice_t notice; char *buf = g_strdup_printf("%s%c%s", sig, '\0', html_buf2); memset((char *)¬ice, 0, sizeof(notice)); - + notice.z_kind = ACKED; notice.z_port = 0; notice.z_opcode = ""; @@ -2201,11 +2201,11 @@ char *local_zephyr_normalize(zephyr_account *zephyr,const char *orig) { - /* - Basically the inverse of zephyr_strip_local_realm - */ + /* + Basically the inverse of zephyr_strip_local_realm + */ char* buf; - + if (!g_ascii_strcasecmp(orig, "")) { return g_strdup(""); } @@ -2214,7 +2214,7 @@ buf = g_strdup_printf("%s",orig); } else { buf = g_strdup_printf("%s@%s",orig,zephyr->realm); - } + } return buf; } @@ -2281,7 +2281,7 @@ if (primitive == PURPLE_STATUS_AWAY) { zephyr->away = g_strdup(purple_status_get_attr_string(status,"message")); - } + } else if (primitive == PURPLE_STATUS_AVAILABLE) { if (use_zeph02(zephyr)) { ZSetLocation(zephyr->exposure); @@ -2295,7 +2295,7 @@ } g_free(zexpstr); } - } + } else if (primitive == PURPLE_STATUS_INVISIBLE) { /* XXX handle errors */ if (use_zeph02(zephyr)) { @@ -2312,12 +2312,12 @@ } } -static GList *zephyr_status_types(PurpleAccount *account) +static GList *zephyr_status_types(PurpleAccount *account) { PurpleStatusType *type; GList *types = NULL; - /* zephyr has several exposures + /* zephyr has several exposures NONE (where you are hidden, and zephyrs to you are in practice silently dropped -- yes this is wrong) OPSTAFF "hidden" REALM-VISIBLE visible to people in local realm @@ -2410,13 +2410,13 @@ instname = g_hash_table_lookup(data, "instance"); recip = g_hash_table_lookup(data, "recipient"); - + if (!classname) return; if (!g_ascii_strcasecmp(classname,"%host%")) classname = g_strdup(zephyr->ourhost); - if (!g_ascii_strcasecmp(classname,"%canon%")) + if (!g_ascii_strcasecmp(classname,"%canon%")) classname = g_strdup(zephyr->ourhostcanon); if (!instname || !strlen(instname)) @@ -2424,7 +2424,7 @@ if (!g_ascii_strcasecmp(instname,"%host%")) instname = g_strdup(zephyr->ourhost); - if (!g_ascii_strcasecmp(instname,"%canon%")) + if (!g_ascii_strcasecmp(instname,"%canon%")) instname = g_strdup(zephyr->ourhostcanon); if (!recip || (*recip == '*')) @@ -2437,15 +2437,15 @@ if (zt2) { free_triple(zt1); if (!zt2->open) { - if (!g_ascii_strcasecmp(instname,"*")) + if (!g_ascii_strcasecmp(instname,"*")) instname = "PERSONAL"; serv_got_joined_chat(gc, zt2->id, zt2->name); zephyr_chat_set_topic(gc,zt2->id,instname); zt2->open = TRUE; - } + } return; } - + /* sub.zsub_class = zt1->class; sub.zsub_classinst = zt1->instance; sub.zsub_recipient = zt1->recipient; */ @@ -2460,7 +2460,7 @@ zephyr->subscrips = g_slist_append(zephyr->subscrips, zt1); zt1->open = TRUE; serv_got_joined_chat(gc, zt1->id, zt1->name); - if (!g_ascii_strcasecmp(instname,"*")) + if (!g_ascii_strcasecmp(instname,"*")) instname = "PERSONAL"; zephyr_chat_set_topic(gc,zt1->id,instname); } @@ -2519,7 +2519,7 @@ static unsigned int zephyr_send_typing(PurpleConnection *gc, const char *who, PurpleTypingState state) { gchar *recipient; zephyr_account *zephyr = gc->proto_data; - if (use_tzc(zephyr)) + if (use_tzc(zephyr)) return 0; if (state == PURPLE_NOT_TYPING) @@ -2565,7 +2565,7 @@ zt = find_sub_by_id(gc->proto_data,id); /* find_sub_by_id can return NULL */ - if (!zt) + if (!zt) return; gconv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT, zt->name, gc->account); @@ -2586,7 +2586,7 @@ zephyr_account *zephyr = purple_conversation_get_gc(conv)->proto_data; if (!g_ascii_strcasecmp(args[0],"*")) return PURPLE_CMD_RET_FAILED; /* "*" is not a valid argument */ - else + else recipient = local_zephyr_normalize(zephyr,args[0]); if (strlen(recipient) < 1) @@ -2594,7 +2594,7 @@ if (zephyr_send_message(zephyr,"MESSAGE","PERSONAL",recipient,args[1],zephyr_get_signature(),"")) return PURPLE_CMD_RET_OK; - else + else return PURPLE_CMD_RET_FAILED; } @@ -2638,7 +2638,7 @@ zephyr_account *zephyr = purple_conversation_get_gc(conv)->proto_data; if ( zephyr_send_message(zephyr,"message",args[0],"",args[1],zephyr_get_signature(),"")) return PURPLE_CMD_RET_OK; - else + else return PURPLE_CMD_RET_FAILED; } @@ -2649,7 +2649,7 @@ zephyr_account *zephyr = purple_conversation_get_gc(conv)->proto_data; if ( zephyr_send_message(zephyr,args[0],args[1],"",args[2],zephyr_get_signature(),"")) return PURPLE_CMD_RET_OK; - else + else return PURPLE_CMD_RET_FAILED; } @@ -2658,7 +2658,7 @@ { /* args = class, instance, recipient, message */ zephyr_account *zephyr = purple_conversation_get_gc(conv)->proto_data; - if ( zephyr_send_message(zephyr,args[0],args[1],args[2],args[3],zephyr_get_signature(),"")) + if ( zephyr_send_message(zephyr,args[0],args[1],args[2],args[3],zephyr_get_signature(),"")) return PURPLE_CMD_RET_OK; else return PURPLE_CMD_RET_FAILED; @@ -2669,7 +2669,7 @@ { /* args = instance, recipient, message */ zephyr_account *zephyr = purple_conversation_get_gc(conv)->proto_data; - if ( zephyr_send_message(zephyr,"message",args[0],args[1],args[2],zephyr_get_signature(),"")) + if ( zephyr_send_message(zephyr,"message",args[0],args[1],args[2],zephyr_get_signature(),"")) return PURPLE_CMD_RET_OK; else return PURPLE_CMD_RET_FAILED; @@ -2680,7 +2680,7 @@ { /* args = class, message */ zephyr_account *zephyr = purple_conversation_get_gc(conv)->proto_data; - if ( zephyr_send_message(zephyr,args[0],"PERSONAL","",args[1],zephyr_get_signature(),"")) + if ( zephyr_send_message(zephyr,args[0],"PERSONAL","",args[1],zephyr_get_signature(),"")) return PURPLE_CMD_RET_OK; else return PURPLE_CMD_RET_FAILED; @@ -2791,13 +2791,13 @@ ZSubscription_t subs; if (use_zeph02(zephyr)) { GString* subout = g_string_new("Subscription list
"); - + title = g_strdup_printf("Server subscriptions for %s", zephyr->username); - + if (zephyr->port == 0) { purple_debug_error("zephyr", "error while retrieving port\n"); return; - } + } if ((retval = ZRetrieveSubscriptions(zephyr->port,&nsubs)) != ZERR_NONE) { /* XXX better error handling */ purple_debug_error("zephyr", "error while retrieving subscriptions from server\n"); @@ -2969,13 +2969,13 @@ option = purple_account_option_bool_new(_("Import from .anyone"), "read_anyone", TRUE); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); - + option = purple_account_option_bool_new(_("Import from .zephyr.subs"), "read_zsubs", TRUE); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); - + option = purple_account_option_string_new(_("Realm"), "realm", ""); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); - + option = purple_account_option_string_new(_("Exposure"), "exposure_level", tmp?tmp: EXPOSE_REALMVIS); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/prpl.c --- a/libpurple/prpl.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/prpl.c Tue Jan 04 06:55:30 2011 +0000 @@ -520,7 +520,7 @@ PurpleAccount *account = purple_connection_get_account(gc); got_attention(gc, -1, who, type_code); - conv = + conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_ANY, who, account); if (conv) purple_prpl_attention(conv, who, type_code, PURPLE_MESSAGE_RECV, @@ -565,14 +565,14 @@ PurpleConnection *gc = NULL; PurplePlugin *prpl = NULL; PurplePluginProtocolInfo *prpl_info = NULL; - + if (account) gc = purple_account_get_connection(account); if (gc) prpl = purple_connection_get_prpl(gc); if (prpl) prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl); - + if (prpl_info && PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl_info, get_media_caps)) { return prpl_info->get_media_caps(account, who); @@ -600,7 +600,7 @@ const gchar *bname = purple_buddy_get_name(buddy); list = g_slist_delete_link(list, list); - + newcaps = purple_prpl_get_media_caps(account, bname); purple_buddy_set_media_caps(buddy, newcaps); diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/request.c --- a/libpurple/request.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/request.c Tue Jan 04 06:55:30 2011 +0000 @@ -1317,10 +1317,10 @@ } void * -purple_request_action_with_icon(void *handle, const char *title, +purple_request_action_with_icon(void *handle, const char *title, const char *primary, const char *secondary, int default_action, - PurpleAccount *account, const char *who, + PurpleAccount *account, const char *who, PurpleConversation *conv, gconstpointer icon_data, gsize icon_size, void *user_data, size_t action_count, ...) { @@ -1330,7 +1330,7 @@ g_return_val_if_fail(action_count > 0, NULL); va_start(args, action_count); - ui_handle = purple_request_action_with_icon_varg(handle, title, primary, + ui_handle = purple_request_action_with_icon_varg(handle, title, primary, secondary, default_action, account, who, conv, icon_data, icon_size, user_data, action_count, args); va_end(args); @@ -1374,7 +1374,7 @@ purple_request_action_with_icon_varg(void *handle, const char *title, const char *primary, const char *secondary, int default_action, - PurpleAccount *account, const char *who, + PurpleAccount *account, const char *who, PurpleConversation *conv, gconstpointer icon_data, gsize icon_size, void *user_data, size_t action_count, va_list actions) diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/theme-manager.c --- a/libpurple/theme-manager.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/theme-manager.c Tue Jan 04 06:55:30 2011 +0000 @@ -295,7 +295,7 @@ PurpleTheme * purple_theme_manager_load_theme(const gchar *theme_dir, const gchar *type) { - PurpleThemeLoader *loader; + PurpleThemeLoader *loader; g_return_val_if_fail(theme_dir != NULL && type != NULL, NULL); diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/util.c --- a/libpurple/util.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/util.c Tue Jan 04 06:55:30 2011 +0000 @@ -3949,27 +3949,27 @@ /* This chunk of code was copied from proxy.c http_start_connect_tunneling() * This is really a temporary hack - we need a more complete proxy handling solution, * so I didn't think it was worthwhile to refactor for reuse - */ + */ char *t1, *t2, *ntlm_type1; char hostname[256]; int ret; - + ret = gethostname(hostname, sizeof(hostname)); hostname[sizeof(hostname) - 1] = '\0'; if (ret < 0 || hostname[0] == '\0') { purple_debug_warning("util", "proxy - gethostname() failed -- is your hostname set?"); strcpy(hostname, "localhost"); } - + t1 = g_strdup_printf("%s:%s", purple_proxy_info_get_username(gpi), purple_proxy_info_get_password(gpi) ? purple_proxy_info_get_password(gpi) : ""); t2 = purple_base64_encode((const guchar *)t1, strlen(t1)); g_free(t1); - + ntlm_type1 = purple_ntlm_gen_type1(hostname, ""); - + g_string_append_printf(request_str, "Proxy-Authorization: Basic %s\r\n" "Proxy-Authorization: NTLM %s\r\n" diff -r 44f53d3fc54f -r a8cc50c2279f libpurple/win32/giowin32.c --- a/libpurple/win32/giowin32.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/win32/giowin32.c Tue Jan 04 06:55:30 2011 +0000 @@ -72,14 +72,14 @@ * as provided by WinSock. */ GIOWin32ChannelType type; - + gboolean debug; CRITICAL_SECTION mutex; /* This is used by G_IO_WIN32_WINDOWS_MESSAGES channels */ HWND hwnd; /* handle of window, or NULL */ - + /* Following fields are used by both fd and socket channels. */ gboolean running; /* Is reader thread running. FALSE if * EOF has been reached. @@ -94,7 +94,7 @@ gushort revents; /* Following fields used by fd channels for input */ - + /* Data is kept in a circular buffer. To be able to distinguish between * empty and full buffer, we cannot fill it completely, but have to * leave a one character gap. @@ -154,7 +154,7 @@ else return FALSE; #endif -} +} static void g_io_channel_win32_init (GIOWin32Channel *channel) @@ -178,7 +178,7 @@ create_events (GIOWin32Channel *channel) { SECURITY_ATTRIBUTES sec_attrs; - + sec_attrs.nLength = sizeof (SECURITY_ATTRIBUTES); sec_attrs.lpSecurityDescriptor = NULL; sec_attrs.bInheritHandle = FALSE; @@ -254,7 +254,7 @@ g_warning (G_STRLOC ": Error binding to reset_recv socket: %s\n", g_win32_error_message (WSAGetLastError ())); } - + len = sizeof (local2); if (getsockname (channel->reset_recv, (struct sockaddr *)&local2, &len) == SOCKET_ERROR) { @@ -292,12 +292,12 @@ channel->fd, (guint) channel->data_avail_event, (guint) channel->data_avail_noticed_event); - + channel->rdp = channel->wrp = 0; channel->running = TRUE; SetEvent (channel->space_avail_event); - + while (channel->running) { FD_ZERO (&read_fds); @@ -317,7 +317,7 @@ FD_SET (channel->fd, &write_fds); if (watch->condition & G_IO_ERR) FD_SET (channel->fd, &except_fds); - + tmp = tmp->next; } UNLOCK (channel->mutex); @@ -328,9 +328,9 @@ (FD_ISSET (channel->fd, &read_fds) ? " IN" : ""), (FD_ISSET (channel->fd, &write_fds) ? " OUT" : ""), (FD_ISSET (channel->fd, &except_fds) ? " ERR" : "")); - + n = select (1, &read_fds, &write_fds, &except_fds, NULL); - + LOCK (channel->mutex); if (channel->needs_close) { @@ -362,7 +362,7 @@ (FD_ISSET (channel->fd, &read_fds) ? " IN" : ""), (FD_ISSET (channel->fd, &write_fds) ? " OUT" : ""), (FD_ISSET (channel->fd, &except_fds) ? " ERR" : "")); - + if (FD_ISSET (channel->fd, &read_fds)) channel->revents |= G_IO_IN; if (FD_ISSET (channel->fd, &write_fds)) @@ -418,9 +418,9 @@ GIOWin32Watch *watch = (GIOWin32Watch *)source; GIOCondition buffer_condition = g_io_channel_get_buffer_condition (watch->channel); GIOWin32Channel *channel = (GIOWin32Channel *)watch->channel; - + *timeout = -1; - + if (channel->debug) g_print ("g_io_win32_prepare: for thread %#x buffer_condition:%#x\n" " watch->pollfd.events:%#x watch->pollfd.revents:%#x channel->revents:%#x\n", @@ -478,7 +478,7 @@ { return (PeekMessage (&msg, channel->hwnd, 0, 0, PM_NOREMOVE)); } - + if (channel->type == G_IO_WIN32_SOCKET) { LOCK (channel->mutex); @@ -503,14 +503,14 @@ GIOFunc func = (GIOFunc)callback; GIOWin32Watch *watch = (GIOWin32Watch *)source; GIOCondition buffer_condition = g_io_channel_get_buffer_condition (watch->channel); - + if (!func) { g_warning (G_STRLOC ": GIOWin32Watch dispatched without callback\n" "You must call g_source_connect()."); return FALSE; } - + return (*func) (watch->channel, (watch->pollfd.revents | buffer_condition) & watch->condition, user_data); @@ -522,7 +522,7 @@ GIOWin32Watch *watch = (GIOWin32Watch *)source; GIOWin32Channel *channel = (GIOWin32Channel *)watch->channel; char send_buffer[] = "f"; - + LOCK (channel->mutex); if (channel->debug) g_print ("g_io_win32_finalize: channel with thread %#x\n", @@ -563,18 +563,18 @@ source = g_source_new (&wp_g_io_watch_funcs, sizeof (GIOWin32Watch)); watch = (GIOWin32Watch *)source; - + watch->channel = channel; g_io_channel_ref (channel); - + watch->condition = condition; - + if (win32_channel->data_avail_event == NULL) create_events (win32_channel); watch->pollfd.fd = (gint) win32_channel->data_avail_event; watch->pollfd.events = condition; - + if (win32_channel->debug) g_print ("g_io_win32_create_watch: fd:%d condition:%#x handle:%#x\n", win32_channel->fd, condition, watch->pollfd.fd); @@ -597,7 +597,7 @@ g_io_win32_free (GIOChannel *channel) { GIOWin32Channel *win32_channel = (GIOWin32Channel *)channel; - + if (win32_channel->debug) g_print ("thread %#x: freeing channel, fd: %d\n", win32_channel->thread_id, @@ -643,7 +643,7 @@ if (win32_channel->debug) g_print ("g_io_win32_sock_read: recv:%d\n", result); - + if (result == SOCKET_ERROR) { *bytes_read = 0; @@ -674,7 +674,7 @@ internal_status = G_IO_STATUS_EOF; } - if ((internal_status == G_IO_STATUS_EOF) || + if ((internal_status == G_IO_STATUS_EOF) || (internal_status == G_IO_STATUS_ERROR)) { LOCK (win32_channel->mutex); @@ -697,7 +697,7 @@ gint result; GIOChannelError error = G_IO_STATUS_NORMAL; char send_buffer[] = "sw"; - + if (win32_channel->debug) g_print ("g_io_win32_sock_write: sockfd:%d count:%d\n", win32_channel->fd, count); @@ -705,10 +705,10 @@ repeat: #endif result = send (win32_channel->fd, buf, count, 0); - + if (win32_channel->debug) g_print ("g_io_win32_sock_write: send:%d\n", result); - + if (result == SOCKET_ERROR) { *bytes_written = 0; @@ -767,7 +767,7 @@ g_print ("thread %#x: closing socket %d\n", win32_channel->thread_id, win32_channel->fd); - + closesocket (win32_channel->fd); win32_channel->fd = -1; } diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/gtkaccount.c --- a/pidgin/gtkaccount.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/gtkaccount.c Tue Jan 04 06:55:30 2011 +0000 @@ -2500,7 +2500,7 @@ prpl_icon = pidgin_create_prpl_icon(account, PIDGIN_PRPL_ICON_SMALL); - + aa = g_new0(struct auth_request, 1); aa->auth_cb = auth_cb; aa->deny_cb = deny_cb; @@ -2509,14 +2509,14 @@ aa->alias = g_strdup(alias); aa->account = account; aa->add_buddy_after_auth = !on_list; - + alert = pidgin_make_mini_dialog_with_custom_icon( gc, prpl_icon, _("Authorize buddy?"), buffer, aa, _("Authorize"), authorize_and_add_cb, _("Deny"), deny_no_add_cb, NULL); - + g_signal_connect_swapped(G_OBJECT(alert), "destroy", G_CALLBACK(free_auth_request), aa); g_signal_connect(G_OBJECT(alert), "destroy", G_CALLBACK(purple_account_request_close), NULL); pidgin_blist_add_alert(alert); diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/gtkblist-theme-loader.c --- a/pidgin/gtkblist-theme-loader.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/gtkblist-theme-loader.c Tue Jan 04 06:55:30 2011 +0000 @@ -136,7 +136,7 @@ if (success) { if ((success = (sub_node = xmlnode_get_child(root_node, "blist")) != NULL)) bgcolor = parse_color(sub_node, "color"); - else + else purple_debug_warning("gtkblist-theme-loader", "Missing or problem with tags: .\n"); } diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/gtkblist.c --- a/pidgin/gtkblist.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/gtkblist.c Tue Jan 04 06:55:30 2011 +0000 @@ -968,7 +968,7 @@ static GtkWidget * make_blist_request_dialog(PidginBlistRequestData *data, PurpleAccount *account, - const char *title, const char *window_role, const char *label_text, + const char *title, const char *window_role, const char *label_text, GCallback callback_func, PurpleFilterAccountFunc filter_func, GCallback response_cb) { @@ -1510,7 +1510,7 @@ } pidgin_new_item_from_stock(menu, _("I_M"), PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW, G_CALLBACK(gtk_blist_menu_im_cb), buddy, 0, 0, NULL); - + #ifdef USE_VV if (prpl_info && prpl_info->get_media_caps) { PurpleAccount *account = purple_buddy_get_account(buddy); @@ -1531,9 +1531,9 @@ G_CALLBACK(gtk_blist_menu_video_call_cb), buddy, 0, 0, NULL); } } - + #endif - + if (prpl_info && prpl_info->send_file) { if (!prpl_info->can_receive_file || prpl_info->can_receive_file(buddy->account->gc, buddy->name)) @@ -3461,13 +3461,13 @@ } } } - + static void global_moods_for_each(gpointer key, gpointer value, gpointer user_data) { GList **out_moods = (GList **) user_data; PurpleMood *mood = (PurpleMood *) value; - + *out_moods = g_list_append(*out_moods, mood); } @@ -3483,7 +3483,7 @@ GList *out_moods = NULL; int i = 0; int num_accounts = 0; - + for (; accounts ; accounts = g_list_delete_link(accounts, accounts)) { PurpleAccount *account = (PurpleAccount *) accounts->data; if (purple_account_is_connected(account)) { @@ -3519,7 +3519,7 @@ while (out_moods) { PurpleMood *mood = (PurpleMood *) out_moods->data; - int in_num_accounts = + int in_num_accounts = GPOINTER_TO_INT(g_hash_table_lookup(mood_counts, mood->mood)); if (in_num_accounts == num_accounts) { @@ -3544,7 +3544,7 @@ { GList *accounts = purple_accounts_get_all_active(); const gchar *found_mood = NULL; - + for (; accounts ; accounts = g_list_delete_link(accounts, accounts)) { PurpleAccount *account = (PurpleAccount *) accounts->data; @@ -3579,7 +3579,7 @@ PurplePluginProtocolInfo *prpl_info = NULL; PurpleMood *mood; PurpleMood *global_moods = get_global_moods(); - + if (account) { PurplePresence *presence = purple_account_get_presence(account); PurpleStatus *status = purple_presence_get_status(presence, "mood"); @@ -3653,7 +3653,7 @@ ***************************************************/ static GtkItemFactoryEntry blist_menu[] = { -/* NOTE: Do not set any accelerator to Control+O. It is mapped by +/* NOTE: Do not set any accelerator to Control+O. It is mapped by gtk_blist_key_press_cb to "Get User Info" on the selected buddy. */ /* Buddies menu */ @@ -4109,7 +4109,7 @@ status = purple_presence_get_status(p, "mood"); name = purple_status_get_attr_string(status, PURPLE_MOOD_NAME); - + if (!(name && *name)) return NULL; @@ -4419,7 +4419,7 @@ } } else { if (name_color) { - text = g_strdup_printf("%s", + text = g_strdup_printf("%s", name_font, name_color, nametext); } else { text = g_strdup_printf("%s", name_font, @@ -6604,7 +6604,7 @@ ihrs, imin); } else { idle = g_strdup_printf("%d:%02d", - theme_font_get_face_default(pair, ""), + theme_font_get_face_default(pair, ""), ihrs, imin); } } @@ -6709,7 +6709,7 @@ tmp = g_strdup_printf("%s", font, fg_color, mark); } else { - tmp = g_strdup_printf("%s", font, + tmp = g_strdup_printf("%s", font, mark); } g_free(mark); @@ -8155,7 +8155,7 @@ gc = purple_account_get_connection(account); plugin = gc && PURPLE_CONNECTION_IS_CONNECTED(gc) ? gc->prpl : NULL; prpl_info = plugin ? PURPLE_PLUGIN_PROTOCOL_INFO(plugin) : NULL; - + if (prpl_info && (PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl_info, get_moods) || PURPLE_PLUGIN_HAS_ACTIONS(plugin))) { diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/gtkconv.c --- a/pidgin/gtkconv.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/gtkconv.c Tue Jan 04 06:55:30 2011 +0000 @@ -1128,7 +1128,7 @@ } #ifdef USE_VV -static void +static void menu_initiate_media_call_cb(gpointer data, guint action, GtkWidget *widget) { PidginWindow *win = (PidginWindow *)data; @@ -1163,7 +1163,7 @@ PurpleConversation *conv = pidgin_conv_window_get_active_conversation(win); if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) { - purple_prpl_send_attention(purple_conversation_get_gc(conv), + purple_prpl_send_attention(purple_conversation_get_gc(conv), purple_conversation_get_name(conv), 0); } } @@ -2232,7 +2232,7 @@ purple_debug_info("gtkconv", "setting active conversation on toolbar %p\n", conv); - gtk_imhtmltoolbar_switch_active_conversation(GTK_IMHTMLTOOLBAR(gtkconv->toolbar), + gtk_imhtmltoolbar_switch_active_conversation(GTK_IMHTMLTOOLBAR(gtkconv->toolbar), conv); if (old_conv == conv) @@ -3297,7 +3297,7 @@ gtk_widget_set_sensitive(win->video_call, caps & PURPLE_MEDIA_CAPS_VIDEO ? TRUE : FALSE); - gtk_widget_set_sensitive(win->audio_video_call, + gtk_widget_set_sensitive(win->audio_video_call, caps & PURPLE_MEDIA_CAPS_AUDIO_VIDEO ? TRUE : FALSE); } else if (purple_conversation_get_type(conv) @@ -3310,7 +3310,7 @@ gtk_widget_set_sensitive(win->audio_call, FALSE); gtk_widget_set_sensitive(win->video_call, FALSE); gtk_widget_set_sensitive(win->audio_video_call, FALSE); - } + } #endif } @@ -3467,7 +3467,7 @@ gtk_item_factory_get_widget(win->menu.item_factory, N_("/Conversation/Media/Audio\\/Video Call")); #endif - + /* --- */ win->menu.send_file = @@ -6561,7 +6561,7 @@ buttons |= GTK_IMHTML_CUSTOM_SMILEY; else buttons &= ~GTK_IMHTML_CUSTOM_SMILEY; - + gtk_imhtml_set_format_functions(GTK_IMHTML(gtkconv->entry), buttons); if (account != NULL) gtk_imhtmltoolbar_associate_smileys(GTK_IMHTMLTOOLBAR(gtkconv->toolbar), purple_account_get_protocol_id(account)); diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/gtkdebug.c --- a/pidgin/gtkdebug.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/gtkdebug.c Tue Jan 04 06:55:30 2011 +0000 @@ -385,20 +385,20 @@ gint m; gint start_pos, end_pos; GtkTextIter ms, me; - + if (!g_match_info_matches(match_info)) break; - + for (m = 0; m < g_match_info_get_match_count(match_info); m++) { if (m == 1) continue; - + g_match_info_fetch_pos(match_info, m, &start_pos, &end_pos); - + if (end_pos == -1) break; - + gtk_text_buffer_get_iter_at_offset(imhtml->text_buffer, &ms, i + start_pos); gtk_text_buffer_get_iter_at_offset(imhtml->text_buffer, &me, @@ -407,7 +407,7 @@ &ms, &me); offset = end_pos; } - + g_match_info_free(match_info); p += offset; i += offset; diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/gtkdocklet-gtk.c --- a/pidgin/gtkdocklet-gtk.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/gtkdocklet-gtk.c Tue Jan 04 06:55:30 2011 +0000 @@ -2,7 +2,7 @@ * System tray icon (aka docklet) plugin for Purple * * Copyright (C) 2007 Anders Hasselqvist - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as * published by the Free Software Foundation; either version 2 of the @@ -12,7 +12,7 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA @@ -98,7 +98,7 @@ static void docklet_gtk_status_activated_cb(GtkStatusIcon *status_icon, gpointer user_data) { - pidgin_docklet_clicked(1); + pidgin_docklet_clicked(1); } static void diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/gtkft.c --- a/pidgin/gtkft.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/gtkft.c Tue Jan 04 06:55:30 2011 +0000 @@ -1156,11 +1156,11 @@ static void pidgin_xfer_add_thumbnail(PurpleXfer *xfer, const gchar *formats) -{ +{ purple_debug_info("ft", "creating thumbnail for transfer\n"); if (purple_xfer_get_size(xfer) <= PIDGIN_XFER_MAX_SIZE_IMAGE_THUMBNAIL) { - GdkPixbuf *thumbnail = + GdkPixbuf *thumbnail = gdk_pixbuf_new_from_file_at_size( purple_xfer_get_local_filename(xfer), 128, 128, NULL); @@ -1172,7 +1172,7 @@ char *option_values[2] = {NULL, NULL}; int i; gchar *format = NULL; - + for (i = 0; formats_split[i]; i++) { if (purple_strequal(formats_split[i], "jpeg")) { purple_debug_info("ft", "creating JPEG thumbnail\n"); @@ -1197,11 +1197,11 @@ format = formats_split[0]; } - gdk_pixbuf_save_to_bufferv(thumbnail, &buffer, &size, format, + gdk_pixbuf_save_to_bufferv(thumbnail, &buffer, &size, format, option_keys, option_values, NULL); if (buffer) { - gchar *mimetype = g_strdup_printf("image/%s", format); + gchar *mimetype = g_strdup_printf("image/%s", format); purple_debug_info("ft", "created thumbnail of %" G_GSIZE_FORMAT " bytes\n", size); diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/gtkimhtml.c --- a/pidgin/gtkimhtml.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/gtkimhtml.c Tue Jan 04 06:55:30 2011 +0000 @@ -3829,7 +3829,7 @@ gtk_imhtml_custom_smiley_save(GtkWidget *w, GtkIMHtmlImageSave *save) { GtkIMHtmlImage *image = (GtkIMHtmlImage *)save->image; - + /* Create an add dialog */ PidginSmiley *editor = pidgin_smiley_edit(NULL, NULL); pidgin_smiley_editor_set_shortcut(editor, image->filename); diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/gtkimhtmltoolbar.c --- a/pidgin/gtkimhtmltoolbar.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/gtkimhtmltoolbar.c Tue Jan 04 06:55:30 2011 +0000 @@ -1590,11 +1590,11 @@ g_object_get_data(G_OBJECT(toolbar), "attention"); g_object_set_data(G_OBJECT(toolbar), "active_conv", conv); - + /* gray out attention button on protocols that don't support it for the time being it is always disabled for chats */ gtk_widget_set_sensitive(attention, - conv && prpl && purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM && + conv && prpl && purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM && PURPLE_PLUGIN_PROTOCOL_INFO(prpl)->send_attention != NULL); } diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/gtkmedia.c --- a/pidgin/gtkmedia.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/gtkmedia.c Tue Jan 04 06:55:30 2011 +0000 @@ -373,7 +373,7 @@ PurpleMediaManager *manager = purple_media_get_manager(media); GstElement *element = purple_media_manager_get_pipeline(manager); gulong handler_id = g_signal_handler_find(G_OBJECT(gst_pipeline_get_bus(GST_PIPELINE(element))), - G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, 0, 0, + G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, 0, 0, NULL, G_CALLBACK(level_message_cb), gtkmedia); if (handler_id) g_signal_handler_disconnect(G_OBJECT(gst_pipeline_get_bus(GST_PIPELINE(element))), @@ -638,7 +638,7 @@ if (gtkmedia->priv->recv_widget == NULL && type & (PURPLE_MEDIA_RECV_VIDEO | PURPLE_MEDIA_RECV_AUDIO)) { - recv_widget = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); + recv_widget = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(gtkmedia->priv->display), recv_widget, TRUE, TRUE, 0); gtk_widget_show(recv_widget); @@ -794,7 +794,7 @@ gtk_window_set_icon(GTK_WINDOW(gtkmedia), icon); g_object_unref(icon); } - + gtk_widget_show(gtkmedia->priv->display); } @@ -918,8 +918,8 @@ PidginMedia *gtkmedia = PIDGIN_MEDIA( pidgin_media_new(media, screenname)); PurpleBuddy *buddy = purple_find_buddy(account, screenname); - const gchar *alias = buddy ? - purple_buddy_get_contact_alias(buddy) : screenname; + const gchar *alias = buddy ? + purple_buddy_get_contact_alias(buddy) : screenname; gtk_window_set_title(GTK_WINDOW(gtkmedia), alias); if (purple_media_is_initiator(media, NULL, NULL) == TRUE) @@ -1076,7 +1076,7 @@ g_signal_connect(G_OBJECT(manager), "init-media", G_CALLBACK(pidgin_media_new_cb), NULL); - purple_media_manager_set_ui_caps(manager, + purple_media_manager_set_ui_caps(manager, PURPLE_MEDIA_CAPS_AUDIO | PURPLE_MEDIA_CAPS_AUDIO_SINGLE_DIRECTION | PURPLE_MEDIA_CAPS_VIDEO | diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/gtkprefs.c --- a/pidgin/gtkprefs.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/gtkprefs.c Tue Jan 04 06:55:30 2011 +0000 @@ -1045,7 +1045,7 @@ add_theme_prefs_combo(GtkWidget *vbox, GtkSizeGroup *combo_sg, GtkSizeGroup *label_sg, GtkListStore *theme_store, - GCallback combo_box_cb, gpointer combo_box_cb_user_data, + GCallback combo_box_cb, gpointer combo_box_cb_user_data, const char *label_str, const char *prefs_path, const char *theme_type) { @@ -1098,7 +1098,7 @@ /* Buddy List Themes */ prefs_blist_themes_combo_box = add_theme_prefs_combo( vbox, combo_sg, label_sg, prefs_blist_themes, - (GCallback)prefs_set_blist_theme_cb, NULL, + (GCallback)prefs_set_blist_theme_cb, NULL, _("Buddy List Theme:"), PIDGIN_PREFS_ROOT "/blist/theme", "blist"); /* Status Icon Themes */ @@ -1790,7 +1790,7 @@ hbox = pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("_TURN server:"), sg, entry, TRUE, NULL); - + pidgin_prefs_labeled_spin_button(hbox, _("_UDP Port:"), "/purple/network/turn_port", 0, 65535, NULL); @@ -1938,7 +1938,7 @@ gtk_widget_show_all(ret); } else { sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); - + browsers = get_available_browsers(); if (browsers != NULL) { label = pidgin_prefs_dropdown_from_list(vbox,_("_Browser:"), PURPLE_PREF_STRING, @@ -1947,7 +1947,7 @@ g_list_free(browsers); gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); gtk_size_group_add_widget(sg, label); - + hbox = gtk_hbox_new(FALSE, 0); label = pidgin_prefs_dropdown(hbox, _("_Open link in:"), PURPLE_PREF_INT, PIDGIN_PREFS_ROOT "/browsers/place", @@ -1959,7 +1959,7 @@ gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); gtk_size_group_add_widget(sg, label); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); - + if (!strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/browsers/browser"), "custom")) gtk_widget_set_sensitive(hbox, FALSE); purple_prefs_connect_callback(prefs, PIDGIN_PREFS_ROOT "/browsers/browser", @@ -1976,7 +1976,7 @@ gtk_widget_set_sensitive(hbox, FALSE); purple_prefs_connect_callback(prefs, PIDGIN_PREFS_ROOT "/browsers/browser", browser_changed2_cb, hbox); - + gtk_widget_show_all(ret); g_object_unref(sg); } diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/gtkrequest.c --- a/pidgin/gtkrequest.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/gtkrequest.c Tue Jan 04 06:55:30 2011 +0000 @@ -595,7 +595,7 @@ static void * pidgin_request_action_with_icon(const char *title, const char *primary, const char *secondary, int default_action, - PurpleAccount *account, const char *who, + PurpleAccount *account, const char *who, PurpleConversation *conv, gconstpointer icon_data, gsize icon_size, void *user_data, size_t action_count, va_list actions) @@ -693,7 +693,7 @@ gdk_pixbuf_loader_close(loader, NULL); g_object_unref(loader); } - + if (!img) { img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION, gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE)); diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/gtkscrollbook.c --- a/pidgin/gtkscrollbook.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/gtkscrollbook.c Tue Jan 04 06:55:30 2011 +0000 @@ -141,7 +141,7 @@ static gboolean scroll_close_cb(PidginScrollBook *scroll_book, GdkEventButton *event) { - if (event->type == GDK_BUTTON_PRESS) + if (event->type == GDK_BUTTON_PRESS) gtk_widget_destroy(gtk_notebook_get_nth_page(GTK_NOTEBOOK(scroll_book->notebook), gtk_notebook_get_current_page(GTK_NOTEBOOK(scroll_book->notebook)))); return FALSE; } diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/gtksound.c --- a/pidgin/gtksound.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/gtksound.c Tue Jan 04 06:55:30 2011 +0000 @@ -221,7 +221,7 @@ } static void -got_attention_cb(PurpleAccount *account, const char *who, +got_attention_cb(PurpleAccount *account, const char *who, PurpleConversation *conv, guint type, PurpleSoundEventID event) { play_conv_event(conv, event); @@ -362,7 +362,7 @@ GINT_TO_POINTER(PURPLE_SOUND_GOT_ATTENTION)); /* for the time being, don't handle sent-attention here, since playing a sound would result induplicate sounds. And fixing that would require changing the - conversation signal for msg-recv */ + conversation signal for msg-recv */ } static void diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/gtkthemes.c --- a/pidgin/gtkthemes.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/gtkthemes.c Tue Jan 04 06:55:30 2011 +0000 @@ -270,7 +270,7 @@ if (len == 0) continue; } - + i = buf; while (isspace(*i)) i++; diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/minidialog.c --- a/pidgin/minidialog.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/minidialog.c Tue Jan 04 06:55:30 2011 +0000 @@ -383,7 +383,7 @@ G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READWRITE); g_object_class_install_property (object_class, PROP_ICON_NAME, param_spec); - + param_spec = g_param_spec_object("custom-icon", "custom-icon", "Pixbuf to use as the dialog's icon", GDK_TYPE_PIXBUF, diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/pidgintooltip.c --- a/pidgin/pidgintooltip.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/pidgintooltip.c Tue Jan 04 06:55:30 2011 +0000 @@ -138,7 +138,7 @@ GdkScreen *screen = NULL; GdkRectangle mon_size; GtkWidget *tipwindow = pidgin_tooltip.tipwindow; - + gdk_display_get_pointer(gdk_display_get_default(), &screen, &x, &y, NULL); mon_num = gdk_screen_get_monitor_at_point(screen, x, y); gdk_screen_get_monitor_geometry(screen, mon_num, &mon_size); diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/plugins/cap/cap.c --- a/pidgin/plugins/cap/cap.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/plugins/cap/cap.c Tue Jan 04 06:55:30 2011 +0000 @@ -93,7 +93,7 @@ } sqlite3_free(sql); - + if(strcmp(purple_status_get_id(get_status_for(buddy)), "offline") == 0) { /* This is kind of stupid, change it. */ if(prediction == 1.0f) @@ -152,7 +152,7 @@ purple_debug_info("cap", "%s\n", sql_select); sqlite3_prepare(_db, sql_select, -1, &stmt, &tail); - + rc = sqlite3_step(stmt); if(rc == SQLITE_DONE) { @@ -189,7 +189,7 @@ purple_debug_info("cap", "%s\n", sql_select); sqlite3_prepare(_db, sql_select, -1, &stmt, &tail); - + rc = sqlite3_step(stmt); if(rc == SQLITE_DONE) { @@ -226,7 +226,7 @@ purple_debug_info("cap", "%s\n", sql_select); sqlite3_prepare(_db, sql_select, -1, &stmt, &tail); - + rc = sqlite3_step(stmt); if(rc == SQLITE_DONE) { @@ -263,7 +263,7 @@ purple_debug_info("cap", "%s\n", sql_select); sqlite3_prepare(_db, sql_select, -1, &stmt, &tail); - + rc = sqlite3_step(stmt); if(rc == SQLITE_DONE) { @@ -296,7 +296,7 @@ purple_status_get_id(get_status_for(stats->buddy)); struct tm *current_time; int minute; - + if(stats->last_message == -1) { time_t now = time(NULL); current_time = localtime(&now); @@ -306,7 +306,7 @@ minute = current_time->tm_min + current_time->tm_hour * 60; insert_cap_msg_count_success(buddy_name, account_id, protocol_id, minute); - + insert_cap_status_count_success(buddy_name, account_id, protocol_id, status_id); stats->last_message = -1; @@ -324,9 +324,9 @@ int minute = current_time->tm_min + current_time->tm_hour * 60; insert_cap_msg_count_failed(buddy_name, account_id, protocol_id, minute); - + insert_cap_status_count_failed(buddy_name, account_id, protocol_id, status_id); - + stats->last_message = -1; stats->last_message_status_id = NULL; } @@ -384,7 +384,7 @@ stats = get_stats_for(buddy); /* insert_word_count(sender, buddy_name, words); */ - + /* If we are waiting for a response from a prior message * then cancel the timeout callback. */ if(stats->timeout_source_id != 0) { @@ -581,7 +581,7 @@ g_free(path); if(rc != SQLITE_OK) return FALSE; - + /* Add tables here */ create_tables(); purple_debug_info("cap", "Database connection successfully made.\n"); @@ -652,7 +652,7 @@ * and the keys are a buddies account id (PurpleBuddy.name). * keys/values are automatically deleted */ _buddy_stats = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, destroy_stats); - + /* ? - Can't remember at the moment */ _my_offline_times = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); @@ -668,7 +668,7 @@ return; purple_debug_info("cap", "Adding plugin functionality.\n"); - + /* Connect all the signals */ purple_signal_connect(purple_conversations_get_handle(), "sent-im-msg", plugin, PURPLE_CALLBACK(sent_im_msg), NULL); @@ -690,7 +690,7 @@ purple_signal_connect(purple_connections_get_handle(), "signed-on", plugin, PURPLE_CALLBACK(signed_on), NULL); - + purple_signal_connect(purple_connections_get_handle(), "signed-off", plugin, PURPLE_CALLBACK(signed_off), NULL); @@ -713,7 +713,7 @@ /* If there are any timeouts waiting to be processed then cancel them */ g_hash_table_foreach(_buddy_stats, cancel_conversation_timeouts, NULL); - + /* Connect all the signals */ purple_signal_disconnect(purple_conversations_get_handle(), "sent-im-msg", plugin, PURPLE_CALLBACK(sent_im_msg)); @@ -735,7 +735,7 @@ purple_signal_disconnect(purple_connections_get_handle(), "signed-on", plugin, PURPLE_CALLBACK(signed_on)); - + purple_signal_disconnect(purple_connections_get_handle(), "signed-off", plugin, PURPLE_CALLBACK(signed_off)); @@ -751,13 +751,13 @@ static gboolean plugin_unload(PurplePlugin *plugin) { purple_debug_info("cap", "CAP plugin unloading\n"); - + /* clean up memory allocations */ if(_buddy_stats) { g_hash_table_foreach(_buddy_stats, write_stats_on_unload, NULL); g_hash_table_destroy(_buddy_stats); } - + /* close database connection */ destroy_database_connection(); @@ -856,13 +856,13 @@ g_signal_connect(G_OBJECT(ui->msg_difference_input), "value-changed", G_CALLBACK(numeric_spinner_prefs_cb), "/plugins/gtk/cap/max_msg_difference"); - + g_signal_connect(G_OBJECT(ui->last_seen_input), "value-changed", G_CALLBACK(numeric_spinner_prefs_cb), "/plugins/gtk/cap/max_seen_difference"); - + g_signal_connect(G_OBJECT(ui->threshold_input), "value-changed", G_CALLBACK(numeric_spinner_prefs_cb), "/plugins/gtk/cap/threshold"); - + return ui; } diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/plugins/convcolors.c --- a/pidgin/plugins/convcolors.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/plugins/convcolors.c Tue Jan 04 06:55:30 2011 +0000 @@ -82,7 +82,7 @@ PurpleMessageFlags flag; char *prefix; const char *text; -} formats[] = +} formats[] = { {PURPLE_MESSAGE_ERROR, PREF_ERROR, N_("Error Messages")}, {PURPLE_MESSAGE_NICK, PREF_NICK, N_("Highlighted Messages")}, @@ -393,7 +393,7 @@ return ret; } -static PidginPluginUiInfo ui_info = +static PidginPluginUiInfo ui_info = { get_config_frame, 0, diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/plugins/crazychat/QTUtilities.c --- a/pidgin/plugins/crazychat/QTUtilities.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/plugins/crazychat/QTUtilities.c Tue Jan 04 06:55:30 2011 +0000 @@ -1,10 +1,10 @@ /* File: QTUtilities.c - + Description: Miscellaneous QuickTime utility routines. Copyright: © Copyright 2003 Apple Computer, Inc. All rights reserved. - + Disclaimer: IMPORTANT: This Apple software is supplied to you by Apple Computer, Inc. ("Apple") in consideration of your agreement to the following terms, and your use, installation, modification or redistribution of this Apple software @@ -39,7 +39,7 @@ OF THE APPLE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - + Change History (most recent first): */ @@ -62,21 +62,21 @@ OSErr result; *theMovie = NULL; - + result = OpenMovieFile(fsspecPtr, &resRefNum, 0); if (result == noErr) { short actualResId = DoTheRightThing; - - result = NewMovieFromFile(theMovie, - resRefNum, - &actualResId, + + result = NewMovieFromFile(theMovie, + resRefNum, + &actualResId, (unsigned char *) 0, 0, (Boolean *) 0); CloseMovieFile(resRefNum); } - + return result; } @@ -95,13 +95,13 @@ OSErr result = noErr; *theMovie = nil; - + result = GetOneFileWithPreview(2, myTypeList, &theFSSpec, NULL); if (result != userCanceledErr) - { + { result = GetMovieFromFile(&theFSSpec, theMovie); } - + return result; } @@ -114,7 +114,7 @@ void NormalizeMovieRect(Movie theMovie) { Rect movieBounds; - + GetMovieBox(theMovie, &movieBounds); OffsetRect(&movieBounds, -movieBounds.left, -movieBounds.top); movieBounds.right = movieBounds.left + 640; @@ -138,13 +138,13 @@ LockPixels(pixMap); rows = pRect->bottom - pRect->top; - + rowBaseAddr = GetPixBaseAddr(pixMap) + (GetPixRowBytes(pixMap) & 0x3fff) * pRect->top + pRect->left * GetPixDepth(pixMap) / 8; do { long cols; UInt32 *baseAddr; - + cols = pRect->right - pRect->left; baseAddr = (UInt32*)rowBaseAddr; rowBaseAddr += (**pixMap).rowBytes & 0x3fff; @@ -169,7 +169,7 @@ OSErr CreateDecompSeqForSGChannelData(SGChannel sgChannel, Rect *srcBounds, GWorldPtr imageDestination, ImageSequence *imageSeqID) { OSErr err = noErr; - + ImageDescriptionHandle imageDesc = (ImageDescriptionHandle)NewHandle(sizeof(ImageDescription)); if (imageDesc) { @@ -178,7 +178,7 @@ // The original version of this code had a bug - it passed in a Crop Rect to DecompressSequenceBegin instead of a scaling matrix // This only worked because of another bug inside QT that reated the crop Rect as a destination rect for DV // the following code does the right thing in all cases. - + if (err == noErr) { MatrixRecord mr; @@ -189,17 +189,17 @@ fromR.right = (**imageDesc).width; fromR.bottom = (**imageDesc).height; RectMatrix(&mr, &fromR, srcBounds); - + err = DecompressSequenceBegin(imageSeqID, imageDesc, imageDestination, 0, nil, &mr,srcCopy,nil,0, codecNormalQuality, bestSpeedCodec); } - + DisposeHandle((Handle)imageDesc); } else { err = MemError(); } - + return err; } @@ -214,21 +214,21 @@ OSErr CreateDecompSeqForGWorldData(GWorldPtr srcGWorld, Rect *srcBounds, MatrixRecordPtr mr, GWorldPtr imageDestination, ImageSequence *imageSeqID) { OSErr err; - + ImageDescriptionHandle imageDesc = (ImageDescriptionHandle)NewHandle(sizeof(ImageDescription)); if (imageDesc) { err = MakeImageDescriptionForPixMap (GetGWorldPixMap(srcGWorld), &imageDesc); - err = DecompressSequenceBegin( imageSeqID, - imageDesc, - imageDestination, - 0, - srcBounds, - mr, - srcCopy, - nil, - 0, - codecNormalQuality, + err = DecompressSequenceBegin( imageSeqID, + imageDesc, + imageDestination, + 0, + srcBounds, + mr, + srcCopy, + nil, + 0, + codecNormalQuality, bestSpeedCodec); DisposeHandle((Handle)imageDesc); } @@ -236,7 +236,7 @@ { err = MemError(); } - + return err; } @@ -254,7 +254,7 @@ OSErr CreateNewSGChannelForRecording(ComponentInstance seqGrab, SGDataUPP dataProc, CGrafPtr drawPort, Rect *theRect, SGChannel *sgChannel, long refCon) { OSErr err = noErr; - + BailErr((err = SGInitialize(seqGrab))); // tell it we're not making a movie @@ -262,13 +262,13 @@ // It wants a port, even if its not drawing to it BailErr((err = SGSetGWorld(seqGrab, drawPort, GetMainDevice()))); BailErr((err = SGNewChannel(seqGrab, VideoMediaType, sgChannel))); - + // let the user configure the video channel //BailErr((err = SGSettingsDialog(seqGrab, *sgChannel, 0, nil, 0, nil, 0))); // ************************ -// ************************************************************ - - - +// ************************************************************ + + + BailErr((err = SGSetChannelBounds(*sgChannel, theRect))); // set usage for new video channel to avoid playthrough BailErr((err = SGSetChannelUsage(*sgChannel, seqGrabRecord ))); //note we don't set seqGrabPlayDuringRecord @@ -282,14 +282,14 @@ ////////// // // DoCloseSG -// Terminate recording for our SG channel - dispose of the channel and +// Terminate recording for our SG channel - dispose of the channel and // the associated SG component instance // ////////// void DoCloseSG(ComponentInstance seqGrab, SGChannel sgChannel, SGDataUPP dataProc) { - if(seqGrab) + if(seqGrab) { SGStop(seqGrab); SGSetDataProc(seqGrab, NULL ,NULL); diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/plugins/crazychat/Utilities.c --- a/pidgin/plugins/crazychat/Utilities.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/plugins/crazychat/Utilities.c Tue Jan 04 06:55:30 2011 +0000 @@ -1,10 +1,10 @@ /* File: Utilities.c - + Description: Miscellaneous Utility routines. Copyright: © Copyright 2003 Apple Computer, Inc. All rights reserved. - + Disclaimer: IMPORTANT: This Apple software is supplied to you by Apple Computer, Inc. ("Apple") in consideration of your agreement to the following terms, and your use, installation, modification or redistribution of this Apple software @@ -39,7 +39,7 @@ OF THE APPLE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - + Change History (most recent first): */ @@ -60,9 +60,9 @@ // // Note that both StandardGetFilePreview and NavGetFile use the function specified by theFilterProc as a // file filter. This framework always passes NULL in the theFilterProc parameter. If you use this function -// in your own code, keep in mind that on Windows the function specifier must be of type FileFilterUPP and +// in your own code, keep in mind that on Windows the function specifier must be of type FileFilterUPP and // on Macintosh it must be of type NavObjectFilterUPP. (You can use the QTFrame_GetFileFilterUPP to create -// a function specifier of the appropriate type.) Also keep in mind that Navigation Services expects a file +// a function specifier of the appropriate type.) Also keep in mind that Navigation Services expects a file // filter function to return true if a file is to be displayed, while the Standard File Package expects the // filter to return false if a file is to be displayed. // @@ -70,7 +70,7 @@ OSErr GetOneFileWithPreview (short theNumTypes, TypeListPtr theTypeList, FSSpecPtr theFSSpecPtr, void *theFilterProc) { - + #if TARGET_OS_WIN32 StandardFileReply myReply; #endif @@ -81,7 +81,7 @@ NavEventUPP myEventUPP = NewNavEventUPP(HandleNavEvent); #endif OSErr myErr = noErr; - + if (theFSSpecPtr == NULL) return(paramErr); @@ -90,7 +90,7 @@ StandardGetFilePreview((FileFilterUPP)theFilterProc, theNumTypes, (ConstSFTypeListPtr)theTypeList, &myReply); if (!myReply.sfGood) return(userCanceledErr); - + // make an FSSpec record myErr = FSMakeFSSpec(myReply.sfFile.vRefNum, myReply.sfFile.parID, myReply.sfFile.name, theFSSpecPtr); #endif @@ -101,34 +101,34 @@ myDialogOptions.dialogOptionFlags -= kNavNoTypePopup; myDialogOptions.dialogOptionFlags -= kNavAllowMultipleFiles; BlockMoveData(kApplicationName, myDialogOptions.clientName, kApplicationName[0] + 1); - + // create a handle to an 'open' resource myOpenList = (NavTypeListHandle)CreateOpenHandle(kApplicationSignature, theNumTypes, theTypeList); if (myOpenList != NULL) HLock((Handle)myOpenList); - + // prompt the user for a file myErr = NavGetFile(NULL, &myReply, &myDialogOptions, myEventUPP, NULL, (NavObjectFilterUPP)theFilterProc, myOpenList, NULL); if ((myErr == noErr) && myReply.validRecord) { AEKeyword myKeyword; DescType myActualType; Size myActualSize = 0; - + // get the FSSpec for the selected file if (theFSSpecPtr != NULL) myErr = AEGetNthPtr(&(myReply.selection), 1, typeFSS, &myKeyword, &myActualType, theFSSpecPtr, sizeof(FSSpec), &myActualSize); NavDisposeReply(&myReply); } - + if (myOpenList != NULL) { HUnlock((Handle)myOpenList); DisposeHandle((Handle)myOpenList); } - + DisposeNavEventUPP(myEventUPP); #endif - + return(myErr); } @@ -142,7 +142,7 @@ Handle CreateOpenHandle (OSType theApplicationSignature, short theNumTypes, TypeListPtr theTypeList) { Handle myHandle = NULL; - + // see if we have an 'open' resource... myHandle = Get1Resource('open', 128); if ( myHandle != NULL && ResError() == noErr ) { @@ -151,22 +151,22 @@ } else { myHandle = NULL; } - + // nope, use the passed in types and dynamically create the NavTypeList if (theTypeList == NULL) return myHandle; - + if (theNumTypes > 0) { myHandle = NewHandle(sizeof(NavTypeList) + (theNumTypes * sizeof(OSType))); if (myHandle != NULL) { NavTypeListHandle myOpenResHandle = (NavTypeListHandle)myHandle; - + (*myOpenResHandle)->componentSignature = theApplicationSignature; (*myOpenResHandle)->osTypeCount = theNumTypes; BlockMoveData(theTypeList, (*myOpenResHandle)->osType, theNumTypes * sizeof(OSType)); } } - + return myHandle; } @@ -180,7 +180,7 @@ PASCAL_RTN void HandleNavEvent(NavEventCallbackMessage theCallBackSelector, NavCBRecPtr theCallBackParms, void *theCallBackUD) { #pragma unused(theCallBackUD) - + if (theCallBackSelector == kNavCBEvent) { switch (theCallBackParms->eventData.eventDataParms.event->what) { case updateEvt: @@ -212,27 +212,27 @@ if ((theFSSpecPtr == NULL) || (theIsSelected == NULL) || (theIsReplacing == NULL)) return(paramErr); - + // assume we are not replacing an existing file *theIsReplacing = false; - + *theIsSelected = false; - + // specify the options for the dialog box NavGetDefaultDialogOptions(&myDialogOptions); myDialogOptions.dialogOptionFlags += kNavNoTypePopup; myDialogOptions.dialogOptionFlags += kNavDontAutoTranslate; BlockMoveData(theFileName, myDialogOptions.savedFileName, theFileName[0] + 1); BlockMoveData(thePrompt, myDialogOptions.message, thePrompt[0] + 1); - + // prompt the user for a file myErr = NavPutFile(NULL, &myReply, &myDialogOptions, myEventUPP, MovieFileType, sigMoviePlayer, NULL); - if ((myErr == noErr) && myReply.validRecord) + if ((myErr == noErr) && myReply.validRecord) { AEKeyword myKeyword; DescType myActualType; Size myActualSize = 0; - + // get the FSSpec for the selected file if (theFSSpecPtr != NULL) myErr = AEGetNthPtr(&(myReply.selection), 1, typeFSS, &myKeyword, &myActualType, theFSSpecPtr, sizeof(FSSpec), &myActualSize); @@ -245,7 +245,7 @@ NavDisposeReply(&myReply); } - + DisposeNavEventUPP(myEventUPP); @@ -268,7 +268,7 @@ CGrafPtr oldPort; GDHandle oldDevice; Rect frame = (**pict).picFrame; - + GetGWorld(&oldPort, &oldDevice); SetGWorld(destGWorld, nil); // normalize coordinates diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/plugins/crazychat/camdata.c --- a/pidgin/plugins/crazychat/camdata.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/plugins/crazychat/camdata.c Tue Jan 04 06:55:30 2011 +0000 @@ -23,7 +23,7 @@ long mWorlds[20]; UInt32 mRedCount[256], mGreenCound[256], mBlueCount[256]; -static void DecompressSequencePreflight(GWorldPtr srcGWorld, +static void DecompressSequencePreflight(GWorldPtr srcGWorld, ImageSequence *imageSeq, GWorldPtr destGWorld, Rect *srcRect); @@ -38,25 +38,25 @@ OSErr InitializeMungData(Rect bounds) { OSErr err = noErr; - - if(myMungData) + + if(myMungData) { DisposeMungData(); } - + myMungData = (mungDataPtr)NewPtrClear(sizeof(mungDataRecord)); - if (myMungData == nil) + if (myMungData == nil) { err = MemError(); goto bail; } myMungData->effect = 0; // always - + BailErr(QTNewGWorld(&(myMungData->gw),bitdepth,&bounds,0,0,0)); LockPixels(GetGWorldPixMap(myMungData->gw)); - + SetMungDataColorDefaults(); @@ -66,8 +66,8 @@ SetCurrentClamp(-1); - - + + myMungData->bounds = bounds; SetRect(&bounds, 0, 0, 256*2+4, 128*3 + 20); @@ -81,32 +81,32 @@ OSErr DisposeMungData(void) { // check this out OSErr err = noErr; - - if(myMungData) + + if(myMungData) { - //if(myMungData->drawSeq) + //if(myMungData->drawSeq) //{ // CDSequenceEnd(myMungData->drawSeq); //} - - if(myMungData->gw) + + if(myMungData->gw) { - DisposeGWorld(myMungData->gw); + DisposeGWorld(myMungData->gw); myMungData->gw = nil; } - - if(myMungData->overlay) + + if(myMungData->overlay) { - DisposeGWorld(myMungData->overlay); + DisposeGWorld(myMungData->overlay); myMungData->overlay = nil; } - - if(myMungData->histoWorld) + + if(myMungData->histoWorld) { - DisposeGWorld(myMungData->histoWorld); + DisposeGWorld(myMungData->histoWorld); myMungData->histoWorld = nil; } - + if (myMungData->effectTimeBase) { DisposeTimeBase(myMungData->effectTimeBase); @@ -126,28 +126,28 @@ return err; } -static void DecompressSequencePreflight(GWorldPtr srcGWorld, +static void DecompressSequencePreflight(GWorldPtr srcGWorld, ImageSequence *imageSeq, GWorldPtr destGWorld, Rect *srcRect) // might not need this one - + { ImageDescriptionHandle imageDesc = nil; - + BailErr(MakeImageDescriptionForPixMap (GetGWorldPixMap(srcGWorld), &imageDesc)); - + // use our built-in decompressor to draw // (**imageDesc).cType = kCustomDecompressorType; - + // *********** MIGHT BE MAKING A BIG MISTAKE ****************** // pass a compressed sample so a codec can perform preflighting before the first DecompressSequenceFrameWhen call - BailErr(DecompressSequenceBegin(imageSeq, - imageDesc, + BailErr(DecompressSequenceBegin(imageSeq, + imageDesc, destGWorld, 0, - srcRect, + srcRect, nil, srcCopy, nil, @@ -169,7 +169,7 @@ void SetMungDataColorDefaults() { - if(myMungData) + if(myMungData) { myMungData->redMin = 2; myMungData->redMax = 254; @@ -183,15 +183,15 @@ void GetMungDataBoundsRect(Rect *boundsRect) // might not need this one { - MacSetRect (boundsRect, - myMungData->bounds.left, - myMungData->bounds.top, - myMungData->bounds.right, + MacSetRect (boundsRect, + myMungData->bounds.left, + myMungData->bounds.top, + myMungData->bounds.right, myMungData->bounds.bottom ); } -void SetCurrentClamp(short index) // :crazy:20040426 +void SetCurrentClamp(short index) // :crazy:20040426 { myMungData->selectedIndex = index; } diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/plugins/crazychat/camproc.c --- a/pidgin/plugins/crazychat/camproc.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/plugins/crazychat/camproc.c Tue Jan 04 06:55:30 2011 +0000 @@ -116,19 +116,19 @@ { OSStatus error; OSErr err = noErr; - - BailErr(err = InitializeMungData(mMungRect)); - + + BailErr(err = InitializeMungData(mMungRect)); + bank = f; - + instance=inst; mMyDataProcPtr = NewSGDataUPP(MiniMungDataProc); mSeqGrab = OpenDefaultComponent(SeqGrabComponentType, 0); - BailErr((err = CreateNewSGChannelForRecording( mSeqGrab, - mMyDataProcPtr, + BailErr((err = CreateNewSGChannelForRecording( mSeqGrab, + mMyDataProcPtr, GetMungDataOffscreen(), // drawing destination - &mMungRect, - &mSGChanVideo, + &mMungRect, + &mSGChanVideo, NULL))); bail: @@ -148,7 +148,7 @@ { SGIdle(mSeqGrab); } - + // Reschedule the event loop timer SetEventLoopTimerNextFireTime(inTimer, kMinimumIdleDurationInMillis); } @@ -161,40 +161,40 @@ ComponentResult err = noErr; CodecFlags ignore; GWorldPtr gWorld; - + if (!myMungData) goto bail; - + gWorld = GetMungDataOffscreen(); if(gWorld) { if (mDecomSeq == 0) // init a decompression sequence { Rect bounds; - + GetMungDataBoundsRect(&bounds); - + BailErr( CreateDecompSeqForSGChannelData(c, &bounds, gWorld, &mDecomSeq)); - + if(1) //if ((!mUseOverlay) && (GetCurrentClamp() == -1) && (!mUseEffect)) { ImageSequence drawSeq; - - err = CreateDecompSeqForGWorldData( gWorld, - &bounds, - nil, + + err = CreateDecompSeqForGWorldData( gWorld, + &bounds, + nil, GetMungDataWindowPort(), &drawSeq); SetMungDataDrawSeq(drawSeq); } } - + // decompress data to our offscreen gworld BailErr(DecompressSequenceFrameS(mDecomSeq,p,len,0,&ignore,nil)); - + // image is now in the GWorld - manipulate it at will! //if ((mUseOverlay) || (GetCurrentClamp() != -1) || (mUseEffect)) //{ @@ -208,9 +208,9 @@ // search for lobsters in our image data DetectLobster(gWorld); //} - + } - + bail: return err; } @@ -221,7 +221,7 @@ // mSGTimerRef = nil; // DisposeEventLoopTimerUPP(mSGTimerUPP); DoCloseSG(mSeqGrab, mSGChanVideo, mMyDataProcPtr); - + } @@ -232,7 +232,7 @@ */ extern unsigned int (*colorBuf)[644]; extern struct input_instance input_data; - + static void DetectLobster(GWorldPtr mungDataOffscreen) { CGrafPtr oldPort; @@ -253,19 +253,19 @@ long R_total=0; long G_total=0; long B_total=0; - - //fprintf(stderr, "Starting to find some lobsters...\n"); + + //fprintf(stderr, "Starting to find some lobsters...\n"); GetPortBounds(mungDataOffscreen, &bounds); OffsetRect(&bounds, -bounds.left, -bounds.top); - - + + UInt32 color; - + int sum_x,sum_y=0; int count=0; int k,j; @@ -279,11 +279,11 @@ colorBuf = GetPixBaseAddr(pix); switch (detection_mode) { - + case PRE_CALIBRATE_MODE: //drawbox(CALIB_TOP, CALIB_BOTTOM, CALIB_LEFT, CALIB_RIGHT); break; - + case CALIBRATE_MODE: SkinStats(pix, y_click-CALIB_RADIUS, y_click+CALIB_RADIUS, x_click-CALIB_RADIUS, x_click+CALIB_RADIUS); scan_region_left=x_click-CALIB_RADIUS;//10; @@ -295,7 +295,7 @@ //fprintf(stderr, "scan left: %d scan right: %d \n",scan_region_left,scan_region_right); head_size_old=50; break; - + case SCAN_MODE: ScanSkin(pix); drawbox(face_top, face_bottom, face_left, face_right,1); @@ -310,14 +310,14 @@ break; } - //fprintf(stderr, "Lobsters found...\n"); + //fprintf(stderr, "Lobsters found...\n"); } - - - - + + + + void ScanSkin(PixMapHandle p) { int y,x,j,k; @@ -336,13 +336,13 @@ sum_x=sum_y=count=0; int horz_count[480]; int vert_count[640]; - + - + memset(horz_count,0,480*sizeof(int)); memset(vert_count,0,640*sizeof(int)); - - if (eye_search_frame_countmax_horz) max_horz=horz_count[y]; if (vert_count[x]>max_vert) max_vert=vert_count[x]; - + //colorBuf[y][x]=0x00FF0000; } } } - - + + left_eye_x=left_eye_x_sum/left_eye_pt_count; left_eye_y=left_eye_y_sum/left_eye_pt_count; right_eye_x=right_eye_x_sum/right_eye_pt_count; right_eye_y=right_eye_y_sum/right_eye_pt_count; - + int width=right_eye_x-left_eye_x; int height=right_eye_y-left_eye_y; double face_ang; @@ -424,9 +424,9 @@ else face_ang=0; face_ang=face_ang*180/pi; //fprintf(stderr,"face angle: %f \n",face_ang); - - if ((left_eye_pt_count<5 || right_eye_pt_count<5 || width==0 || face_ang > 30 || face_ang < -30 - || left_eye_y < (face_top+.15*(face_bottom-face_top)) + + if ((left_eye_pt_count<5 || right_eye_pt_count<5 || width==0 || face_ang > 30 || face_ang < -30 + || left_eye_y < (face_top+.15*(face_bottom-face_top)) || right_eye_y < (face_top+.15*(face_bottom-face_top))) && bozo_bit==1){ eye_unconfidence++; @@ -449,17 +449,17 @@ eye_search_frame_count=0; //fprintf(stderr, "Recalibrating eyes\n"); } - + if ((last_eye_count_left-left_eye_pt_count> BLINK_THRESHOLD) && eye_unconfidence==0) { - left_eye_blink_count=BLINK_LENGTH; + left_eye_blink_count=BLINK_LENGTH; } if (left_eye_blink_count>0){ instance->face.left_eye_open=0; left_eye_blink_count--; } - else instance->face.left_eye_open=1; - + else instance->face.left_eye_open=1; + if ((last_eye_count_right-right_eye_pt_count> BLINK_THRESHOLD) && eye_unconfidence==0) { right_eye_blink_count=BLINK_LENGTH; @@ -472,15 +472,15 @@ if (instance->face.right_eye_open==0) instance->face.left_eye_open=0; if (instance->face.left_eye_open==0) instance->face.right_eye_open=0; - + last_eye_count_left=left_eye_pt_count; last_eye_count_right=right_eye_pt_count; float x_shift=0; if (width!=0) x_shift= (float)height/(float)width; // --> note dependence on earlier data here - -if (bozo_bit==1){ + +if (bozo_bit==1){ int mouth_search_start_y=face_top+(.6*(face_bottom-face_top)); int mouth_search_end_y=face_bottom; int mouth_search_start_x=(left_eye_x+right_eye_x)/2 + (-x_shift*(mouth_search_start_y-((right_eye_y+left_eye_y)/2))) ; @@ -495,14 +495,14 @@ G = (color & 0x0000FF00) >> 8; B = (color & 0x000000FF) >> 0; lum=R+G+B; - + if (lum face_bottom) mouth_bottom=face_bottom; - + white_count=0; for (y=mouth_top; y< mouth_bottom; y++){ @@ -529,12 +529,12 @@ } } } - + } else white_count=10; // This next section finds the face region and sets the face_* parameters. - + int scan; float thresh=.3; scan=scan_region_left+1; @@ -546,10 +546,10 @@ { face_left=scan; break; - } + } scan++; } - + scan=scan_region_right-1; if (scan>=640) scan=639; while(1) @@ -558,10 +558,10 @@ { face_right=scan; break; - } + } scan--; } - + scan=scan_region_top+1; if (scan<0) scan=0; while(1) @@ -570,11 +570,11 @@ { face_top=scan; break; - } + } scan++; } - - + + scan=scan_region_bottom-1; if (scan>=480) scan=479; while(1) @@ -583,10 +583,10 @@ { face_bottom=scan; break; - } + } scan--; } - + // Base scan region on face region here scan_region_left=face_left-10; if (scan_region_left <= 0) scan_region_left=1; @@ -596,10 +596,10 @@ if (scan_region_top <= 0) scan_region_top=1; scan_region_bottom=face_bottom+10; if (scan_region_bottom >= 480) scan_region_bottom=479; - - + + // Calculate some stats - + // face size width=face_right-face_left; guint8 temp=width*100/640; @@ -610,7 +610,7 @@ instance->face.x=temp; temp=((double)100/(double)480)*(double)(face_top+face_bottom)/2; instance->face.y=temp; - + // face angle-Z instance->face.head_z_rot=face_ang+50; @@ -628,23 +628,23 @@ if (right_eye_strad > left_eye_strad) y_ang=-y_ang; temp = (guint8) 50 + y_ang; instance->face.head_y_rot=temp; - + if (abs (temp-50) > 15) instance->face.head_size=head_size_old; else head_size_old=instance->face.head_size; temp = (guint8) 100 * white_count / WHITE_COUNT_MAX; if (temp > 100) temp=100; instance->face.mouth_open = temp; - + } - + // draw bounding box for either calibration or face - + void SetEyeSearchRegions(void) { @@ -654,25 +654,25 @@ left_eye_bottom=face_top+(.6*(face_bottom-face_top)); left_eye_right=((face_left+face_right)/2); left_eye_left=face_left+.15*(face_right-face_left); - + right_eye_top=face_top+(.25*(face_bottom-face_top)); right_eye_bottom=face_top+(.6*(face_bottom-face_top)); right_eye_right=face_right-.15*(face_right-face_left); right_eye_left=((face_left+face_right)/2); } - + if (bozo_bit==1) { left_eye_top=left_eye_y-20; left_eye_bottom=left_eye_y+20; left_eye_left=left_eye_x-20; left_eye_right=left_eye_x+20; - + right_eye_top=right_eye_y-20; right_eye_bottom=right_eye_y+20; right_eye_left=right_eye_x-20; right_eye_right=right_eye_x+20; - } + } } @@ -681,7 +681,7 @@ int y, x, j; unsigned int col; - + if (color==1) col=0x00FFFF00; @@ -696,27 +696,27 @@ if (left>=640) left=639; if (right<0) right =0; if (right>=640) right=639; - + if (color==1){ for (y=top; y> 16; G = (color & 0x0000FF00) >> 8; B = (color & 0x000000FF) >> 0; Y=.253*R+.684*G+.063*B; E=.5*R-.5*G; - S=.25*R+.25*G-.5*B; + S=.25*R+.25*G-.5*B; Y_sum+=Y; E_sum+=E; S_sum+=S; } } - + Y_mean=Y_sum/count; E_mean=E_sum/count; S_mean=S_sum/count; - + Y_sum=E_sum=S_sum=0; - + for (y=top; y> 0; Y=.253*R+.684*G+.063*B; E=.5*R-.5*G; - S=.25*R+.25*G-.5*B; - + S=.25*R+.25*G-.5*B; + Y_sum+=(Y-Y_mean)*(Y-Y_mean); E_sum+=(E-E_mean)*(E-E_mean); S_sum+=(S-S_mean)*(S-S_mean); } } - + Y_dev=sqrt(Y_sum/(count-1)); E_dev=sqrt(E_sum/(count-1)); S_dev=sqrt(S_sum/(count-1)); - - //fprintf(stderr,"Y: %f, %f\n E: %f, %f\nS: %f, %f\n",Y_mean,E_mean,S_mean,Y_dev,E_dev,S_dev); + + //fprintf(stderr,"Y: %f, %f\n E: %f, %f\nS: %f, %f\n",Y_mean,E_mean,S_mean,Y_dev,E_dev,S_dev); } diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/plugins/crazychat/cc_features.c --- a/pidgin/plugins/crazychat/cc_features.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/plugins/crazychat/cc_features.c Tue Jan 04 06:55:30 2011 +0000 @@ -116,7 +116,7 @@ /*pthread_t userinput_t; // should we put this in a nicer wrapper?*/ struct draw_info *info; - struct input_instance *instance; + struct input_instance *instance; info = (struct draw_info*)malloc(sizeof(*info)); assert(info); memset(info, 0, sizeof(*info)); @@ -196,7 +196,7 @@ hbox = gtk_hbox_new(TRUE, 0); gtk_box_pack_start(GTK_BOX(ret.vbox), hbox, FALSE, FALSE, 0); gtk_widget_show(hbox); - + glist = NULL; glist = g_list_append(glist, "Red"); glist = g_list_append(glist, "Dark Brown"); @@ -306,7 +306,7 @@ /*** OpenGL BEGIN ***/ if (!gdk_gl_drawable_gl_begin(gldrawable, glcontext)) return FALSE; - + /* Undo all of the Model lighting here*/ @@ -329,8 +329,8 @@ glLoadIdentity(); - - + + gdk_gl_drawable_gl_end(gldrawable); /*** OpenGL END ***/ @@ -352,7 +352,7 @@ } else if (!strcmp(string, "Shark")) { features->kind = 1; } - + material_set(GTK_ENTRY(GTK_COMBO(instance->head)->entry), &features->head_color); material_set(GTK_ENTRY(GTK_COMBO(instance->appendage)->entry), @@ -369,7 +369,7 @@ } else { instance->face.mode = 0; } - + if (mode_change>0){ mode_change--; config_wrapper(widget, event, data); @@ -392,7 +392,7 @@ // fprintf(stderr, "We're fucked this time.\n"); return FALSE; } - + glClearColor(0.0, 0.0, 0.0, 0.0); glClear(GL_COLOR_BUFFER_BIT); @@ -402,11 +402,11 @@ gdk_gl_drawable_swap_buffers(gldrawable); else glFlush(); - + gdk_gl_drawable_gl_end(gldrawable); - + /*** OpenGL END ***/ - + return TRUE; } diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/plugins/crazychat/cc_gtk_gl.c --- a/pidgin/plugins/crazychat/cc_gtk_gl.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/plugins/crazychat/cc_gtk_gl.c Tue Jan 04 06:55:30 2011 +0000 @@ -137,7 +137,7 @@ GtkWidget *drawing_area; assert(data); - + drawing_area = gtk_drawing_area_new(); assert(drawing_area); @@ -183,7 +183,7 @@ GLfloat aspect; // Debug("configuring\n"); - + /*** OpenGL BEGIN ***/ if (!gdk_gl_drawable_gl_begin(gldrawable, glcontext)) return FALSE; @@ -212,7 +212,7 @@ { struct draw_info *info = (struct draw_info*)data; Debug("map\n"); - + if (info->timeout) { widget_draw_timer_add(widget, info); } @@ -223,7 +223,7 @@ { struct draw_info *info = (struct draw_info*)data; Debug("unmap\n"); - + if (info->timeout) { widget_draw_timer_remove(widget, info); } @@ -235,7 +235,7 @@ { struct draw_info *info = (struct draw_info*)data; Debug("visibility\n"); - + if (event->state == GDK_VISIBILITY_FULLY_OBSCURED) { Debug("obscured\n"); if (info->timeout) { @@ -280,7 +280,7 @@ static void destroy_event(GtkWidget *widget, struct draw_info *data) { Debug("destroying widget\n"); - + if (data) { widget_draw_timer_remove(widget, data); free(data); diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/plugins/crazychat/cc_network.c --- a/pidgin/plugins/crazychat/cc_network.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/plugins/crazychat/cc_network.c Tue Jan 04 06:55:30 2011 +0000 @@ -69,7 +69,7 @@ struct cc_session *session); /** - * Handles checking the network for new feature data and sending out the + * Handles checking the network for new feature data and sending out the * latest features. * @param session the session we're checking for network traffic */ @@ -99,7 +99,7 @@ PurpleConversation *conv; PurpleConvIm *im; char buf[BUFSIZ]; - + session = cc_find_session(cc, name); if (session) return; /* already have a session with this guy */ session = cc_add_session(cc, name); @@ -158,7 +158,7 @@ g_signal_connect(GTK_OBJECT(dialog), "response", G_CALLBACK(invite_handler), args); - + gtk_widget_show_all(dialog); } } @@ -184,7 +184,7 @@ static void cc_net_send_ready(PurpleAccount *account, struct cc_session *session) { struct sock_accept_args *args; - + assert(session); Debug("Initializing the server socket and sending ready message\n"); /* create the server socket */ @@ -261,7 +261,7 @@ char buf[BUFSIZ]; PurpleConversation *conv; PurpleConvIm *im; - + if (response == GTK_RESPONSE_ACCEPT) { assert(args); session = cc_find_session(args->cc, args->name); @@ -319,7 +319,7 @@ sock = accept(session->tcp_sock, (struct sockaddr*)&client_addr, &sin_size); assert(sock != -1); - + /* check if it's a match */ if (client_addr.sin_addr.s_addr == session->peer_ip) { /* cool, we're set */ @@ -354,9 +354,9 @@ struct sockaddr_in my_addr; struct sockaddr_in peer_addr; int reuse; - + /* send/obtain the udp port information */ - + assert(__send(session->tcp_sock, (char*)&session->cc->udp_port, sizeof(session->cc->udp_port)) == sizeof(session->cc->udp_port)); @@ -365,14 +365,14 @@ sizeof(session->peer_port)); Debug("Established a CrazyChat session with %s!\n", session->name); - + /* connect the udp sockets */ - + session->udp_sock = socket(AF_INET, SOCK_DGRAM, 0); assert(!setsockopt(session->udp_sock, SOL_SOCKET, SO_REUSEADDR, &reuse, sizeof(reuse))); - + my_addr.sin_family = AF_INET; my_addr.sin_port = htons(session->cc->udp_port); assert(inet_aton(purple_network_get_my_ip(-1), @@ -387,7 +387,7 @@ Debug("Bound udp sock to port %d, connecting to port %d\n", session->cc->udp_port, session->peer_port); - + memset(&session->features, 0, sizeof(session->features)); session->output = init_output(&session->features, session); @@ -452,7 +452,7 @@ assert(ret != -1); features = &session->features; - + while (ret) { /* have data, let's copy it for output */ struct sockaddr_in from; int fromlen; diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/plugins/crazychat/cc_output.c --- a/pidgin/plugins/crazychat/cc_output.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/plugins/crazychat/cc_output.c Tue Jan 04 06:55:30 2011 +0000 @@ -60,20 +60,20 @@ curr_mode = NORMAL; return; */ - + //find z plane from percentage of face if(instance->features->head_size==0){ z = 5; - } + } temp = (GLfloat)instance->features->head_size/40.0; //printf("head size %d\n", instance->features->head_size); - + minZ = ROOT_3; z = ROOT_3*(PERSONS_HEAD/temp); if(z < minZ) z = minZ; - + //these calculations are based on a 90 degree viewing angle rangeX = z*(TAN_30)*2; rangeY = window_aspect*rangeX; @@ -87,7 +87,7 @@ x = 0 + temp*rangeX/1.0; } - temp = (GLfloat)instance->features->y; + temp = (GLfloat)instance->features->y; if(temp>50){ temp = (temp-50.0)/50.0; @@ -113,14 +113,14 @@ mouth_open = (float)instance->features->mouth_open/105; count++; - //mouth_open = (count%10)/(10); + //mouth_open = (count%10)/(10); if(instance->features->left_eye_open==0){ left_open = FALSE; } else{ left_open = TRUE; - } + } if(instance->features->right_eye_open==0) right_open = FALSE; @@ -141,7 +141,7 @@ which_face=DOG; else which_face=SHARK; - + } @@ -151,7 +151,7 @@ { GdkGLContext *glcontext = gtk_widget_get_gl_context(widget); GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable(widget); - + GLfloat w = widget->allocation.width; GLfloat h = widget->allocation.height; GLfloat aspect; @@ -174,7 +174,7 @@ window_aspect = h / w; } - //glOrtho(-10, 10, -10,10, 0.0001, 1000); + //glOrtho(-10, 10, -10,10, 0.0001, 1000); gluPerspective(90.0, window_aspect, 0.0001, 1000.0); glMatrixMode(GL_MODELVIEW); @@ -194,7 +194,7 @@ fprintf(stderr,"null\n"); } assert(instance); - Interpolate(instance); + Interpolate(instance); GdkGLContext *glcontext = gtk_widget_get_gl_context (widget); GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable (widget); @@ -212,11 +212,11 @@ glClearColor(1.0, 1.0, 1.0, 0.0); //glDisable(GL_CULL_FACE); - glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); glColor3f(1.0, 1.0, 1.0); glMatrixMode(GL_MODELVIEW); glLoadIdentity(); - + glTranslatef(x, y, -z); if(instance->my_output==LOCAL){ if(which_face==DOG){ @@ -226,7 +226,7 @@ else { change_materials(local_shark_face, curr_materials, DOG_SHARK_CHANGE); draw_face(local_shark_face, zrot, yrot, left_open, right_open, mouth_open, dir, curr_mode); - } + } } else{ if(which_face==DOG){ @@ -245,7 +245,7 @@ return TRUE; } -void init (GtkWidget *widget, void *data) +void init (GtkWidget *widget, void *data) { setupDrawlists(REMOTE); setupLighting(widget); @@ -282,14 +282,14 @@ //glColorMaterial(GL_FRONT, GL_AMBIENT_AND_DIFFUSE); glMaterialfv(GL_FRONT, GL_DIFFUSE, diffuse); glMateriali(GL_FRONT, GL_SHININESS, 128); - + //glEnable(GL_CULL_FACE); - + glClear(GL_COLOR_BUFFER_BIT); glMatrixMode(GL_PROJECTION); glLoadIdentity(); //glOrtho(-2, 2, -2, 2, 0.0001, 1000); - + if (w > h) { window_aspect = w / h; } else { diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/plugins/crazychat/cc_pidgin_plugin.c --- a/pidgin/plugins/crazychat/cc_pidgin_plugin.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/plugins/crazychat/cc_pidgin_plugin.c Tue Jan 04 06:55:30 2011 +0000 @@ -169,7 +169,7 @@ static void cc_init(struct crazychat *cc) { /* initialize main crazychat thread */ - + assert(cc); memset(cc, 0, sizeof(*cc)); @@ -243,7 +243,7 @@ cc_net_recv_ready(account, cc, *sender); return TRUE; } - + return FALSE; } @@ -345,7 +345,7 @@ button1 = gtk_radio_button_new_with_label(NULL, _("Enabled")); gtk_box_pack_start(GTK_BOX(vbox), button1, TRUE, TRUE, 0); gtk_widget_show(button1); - + group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(button1)); button2 = gtk_radio_button_new_with_label(group, _("Disabled")); gtk_box_pack_start(GTK_BOX(vbox), button2, TRUE, TRUE, 0); @@ -367,9 +367,9 @@ button = gtk_button_new_with_label("Calibrate"); gtk_box_pack_start(GTK_BOX(vbox), button, TRUE, FALSE, 0); gtk_widget_show(button); - + gtk_widget_show(ret); - + return ret; } @@ -451,7 +451,7 @@ } Debug("CrazyChat plugin loaded.\n"); - + return TRUE; } diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/plugins/crazychat/crazychat.c --- a/pidgin/plugins/crazychat/crazychat.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/plugins/crazychat/crazychat.c Tue Jan 04 06:55:30 2011 +0000 @@ -65,7 +65,7 @@ void cc_remove_session(struct crazychat *cc, struct cc_session *session) { struct cc_session_node *curr, *prev; - + assert(cc); assert(session); diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/plugins/crazychat/dog_lids.c --- a/pidgin/plugins/crazychat/dog_lids.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/plugins/crazychat/dog_lids.c Tue Jan 04 06:55:30 2011 +0000 @@ -17,7 +17,7 @@ void initLids(){ GLint test; int i; - + GLint[0]=Gen3DObjectListLid1(); GLint[1]=Gen3DObjectListLid2(); GLint[2]=Gen3DObjectListLid3(); diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/plugins/crazychat/doggy.c --- a/pidgin/plugins/crazychat/doggy.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/plugins/crazychat/doggy.c Tue Jan 04 06:55:30 2011 +0000 @@ -21,7 +21,7 @@ #define IRIS_Y 1.67*SCALE//.015 #define IRIS_Z 7*SCALE//.08 #define PUP_X 0*SCALE -#define PUP_Y 0*SCALE +#define PUP_Y 0*SCALE #define PUP_Z 1.2*SCALE //.028 #define IRIS_SCALE .12*SCALE #define PUP_SCALE .11*SCALE @@ -113,7 +113,7 @@ glTranslatef(0, 0, EYES_Y); glTranslatef(0, -EYES_Z,0); draw_left_eye(f, left_open, max_eye); - draw_right_eye(f, right_open, max_eye); + draw_right_eye(f, right_open, max_eye); glPopMatrix(); } @@ -156,8 +156,8 @@ } void draw_dog(FACE f, GLfloat angle, GLfloat yangle, BOOL left_open, BOOL right_open, GLfloat open, DIRECTION dir, OUTPUT_MODE mode){ - int next_face; - struct doggy_struct* dog; + int next_face; + struct doggy_struct* dog; f->crazy_count--; if(f->crazy_count==0){ f->my_mode = mode; @@ -178,7 +178,7 @@ glRotatef(-90, 1.0, 0.0, 0.0); glRotatef(-yangle, 0.0, 0.0, -1.0); glRotatef(-angle, 0, 1, 0); - dog_eyes(f, angle, yangle, left_open, right_open, dir); + dog_eyes(f, angle, yangle, left_open, right_open, dir); dog_ears(f, dir); glmSetMat(f->materials, f->mat_indeces[HEAD]); glCallList(dog->faces[dog->curr_face]); @@ -201,10 +201,10 @@ f->name = strdup("dog"); f->draw_func = draw_dog; dog = (struct doggy_struct*)f->char_struct; - + printf("\nReading models: "); fflush(0); - + //initialize the draw lists init_lists(&dog->faces, &dog->m_faces, NUM_DOGS, f->name, DOG_SCALE); init_lists(&dog->lids, &dog->m_lids, NUM_DOG_LIDS, "lid", LID_SCALE); @@ -215,7 +215,7 @@ printf("\n"); fflush(0); - + dog->curr_face = 0; dog->curr_ear = 1; dog->curr_left_lid = 9; diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/plugins/crazychat/draw.c --- a/pidgin/plugins/crazychat/draw.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/plugins/crazychat/draw.c Tue Jan 04 06:55:30 2011 +0000 @@ -40,35 +40,35 @@ ctrlpoints[0][0][0]=points[0][0]; ctrlpoints[0][0][1]=points[0][1]; ctrlpoints[0][0][2]=points[0][2]; - + ctrlpoints[0][1][0]=points[1][0]; ctrlpoints[0][1][1]=points[1][1]; ctrlpoints[0][1][2]=points[1][2]; - + ctrlpoints[0][2][0]=points[2][0]; ctrlpoints[0][2][1]=points[2][1]; ctrlpoints[0][2][2]=points[2][2]; - + ctrlpoints[1][0][0]=points[0][0]; ctrlpoints[1][0][1]=points[0][1]; ctrlpoints[1][0][2]=points[0][2]; - + ctrlpoints[1][1][0]=0; ctrlpoints[1][1][1]=0; ctrlpoints[1][1][2]=back; - + ctrlpoints[1][2][0]=points[2][0]; ctrlpoints[1][2][1]=points[2][1]; ctrlpoints[1][2][2]=points[2][2]; - + ctrlpoints[2][0][0]=points[0][0]; ctrlpoints[2][0][1]=points[0][1]; ctrlpoints[2][0][2]=points[0][2]; - + ctrlpoints[2][1][0]=points[3][0]; ctrlpoints[2][1][1]=points[3][1]; ctrlpoints[2][1][2]=points[3][2]; - + ctrlpoints[2][2][0]=points[2][0]; ctrlpoints[2][2][1]=points[2][1]; ctrlpoints[2][2][2]=points[2][2]; @@ -78,7 +78,7 @@ { GLshort[4][3][3] ctrlpoints; CalculateMouthPoints(ctrlpoints, p); - + glMap2f(GL_MAP2_VERTEX_3, 0, 10, 3, 3, 0.0, 10.0, 9, 3, &ctrlpoints[0][0][0]); glEnable(GL_MAP2_VERTEX_3); glMapGrid2f(10, 0, 10, 10, 0, 10); @@ -87,7 +87,7 @@ } void initEyes(){ - + void drawEyes(struct Packet* p){ GLshort eye[3][3][3]; @@ -95,12 +95,12 @@ glMap2f(GL_MAP2_VERTEX_3, 0, 10, 3, 3, 0.0, 10.0, 9, 3, &eyep[0][0][0]); glMapGrid2f(10, 0, 10, 10, 0, 10); glEvalMesh2(GL_FILL, 0, 10, 0, 10); - + CalculateEyePoints(eye, p, RIGHT); glMap2f(GL_MAP2_VERTEX_3, 0, 10, 3, 3, 0.0, 10.0, 9, 3, &eyep[0][0][0]); glMapGrid2f(10, 0, 10, 10, 0, 10); glEvalMesh2(GL_FILL, 0, 10, 0, 10); - + } void drawHead(struct Packet* p){ diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/plugins/crazychat/eye.c --- a/pidgin/plugins/crazychat/eye.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/plugins/crazychat/eye.c Tue Jan 04 06:55:30 2011 +0000 @@ -1,18 +1,18 @@ /* -This file was produced by Deep Exploration Plugin: CPP Export filter. +This file was produced by Deep Exploration Plugin: CPP Export filter. -Deep Exploration +Deep Exploration -Copyright (c) 1999-2003 Right Hemisphere, Inc +Copyright (c) 1999-2003 Right Hemisphere, Inc -WWW http://www.righthemisphere.com/dexp.htm +WWW http://www.righthemisphere.com/dexp.htm eMail support@righthemisphere.com */ //#include #include #include -#include +#include typedef struct sample_MATERIAL{ GLfloat ambient[3]; diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/plugins/crazychat/eyes.c --- a/pidgin/plugins/crazychat/eyes.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/plugins/crazychat/eyes.c Tue Jan 04 06:55:30 2011 +0000 @@ -1,11 +1,11 @@ /* -This file was produced by Deep Exploration Plugin: CPP Export filter. +This file was produced by Deep Exploration Plugin: CPP Export filter. -Deep Exploration +Deep Exploration -Copyright (c) 1999-2003 Right Hemisphere, Inc +Copyright (c) 1999-2003 Right Hemisphere, Inc -WWW http://www.righthemisphere.com/dexp.htm +WWW http://www.righthemisphere.com/dexp.htm eMail support@righthemisphere.com */ //#include diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/plugins/crazychat/face.c --- a/pidgin/plugins/crazychat/face.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/plugins/crazychat/face.c Tue Jan 04 06:55:30 2011 +0000 @@ -10,7 +10,7 @@ switch(kind){ case DOG: - init_dog(face); + init_dog(face); break; case SHARK: init_shark(face); @@ -19,8 +19,8 @@ printf("default face\n"); init_dog(face); break; - } - return face; + } + return face; } void draw_face(FACE face, GLfloat zrot, GLfloat yrot, BOOL left_eye, BOOL right_eye, GLfloat mouth_open, DIRECTION dir, OUTPUT_MODE mode){ diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/plugins/crazychat/filter.c --- a/pidgin/plugins/crazychat/filter.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/plugins/crazychat/filter.c Tue Jan 04 06:55:30 2011 +0000 @@ -39,9 +39,9 @@ features->head_size=(guint8) ( (coef_0*(f->head_size[0]+f->head_size[9]))+(coef_1*(f->head_size[1]+f->head_size[8])) + (coef_2*(f->head_size[2]+f->head_size[7])) + (coef_3*(f->head_size[3]+f->head_size[6])) + (coef_4*(f->head_size[4]+f->head_size[5]))); - + - + f->head_z_rot[9]=f->head_z_rot[8]; f->head_z_rot[8]=f->head_z_rot[7]; f->head_z_rot[7]=f->head_z_rot[6]; @@ -57,7 +57,7 @@ (coef_2*(f->head_z_rot[2]+f->head_z_rot[7])) + (coef_3*(f->head_z_rot[3]+f->head_z_rot[6])) + (coef_4*(f->head_z_rot[4]+f->head_z_rot[5]))); - + f->head_y_rot[9]=f->head_y_rot[8]; f->head_y_rot[8]=f->head_y_rot[7]; f->head_y_rot[7]=f->head_y_rot[6]; @@ -71,8 +71,8 @@ features->head_y_rot=(guint8) ( (coef_0*(f->head_y_rot[0]+f->head_y_rot[9]))+(coef_1*(f->head_y_rot[1]+f->head_y_rot[8])) + (coef_2*(f->head_y_rot[2]+f->head_y_rot[7])) + (coef_3*(f->head_y_rot[3]+f->head_y_rot[6])) - + (coef_4*(f->head_y_rot[4]+f->head_y_rot[5]))); - + + (coef_4*(f->head_y_rot[4]+f->head_y_rot[5]))); + f->xfilt[9]=f->xfilt[8]; f->xfilt[8]=f->xfilt[7]; @@ -88,8 +88,8 @@ features->x=(guint8) ( (coef_0*(f->xfilt[0]+f->xfilt[9]))+(coef_1*(f->xfilt[1]+f->xfilt[8])) + (coef_2*(f->xfilt[2]+f->xfilt[7])) + (coef_3*(f->xfilt[3]+f->xfilt[6])) + (coef_4*(f->xfilt[4]+f->xfilt[5]))); - - + + f->yfilt[9]=f->yfilt[8]; f->yfilt[8]=f->yfilt[7]; f->yfilt[7]=f->yfilt[6]; @@ -104,8 +104,8 @@ features->y=(guint8) ( (coef_0*(f->yfilt[0]+f->yfilt[9]))+(coef_1*(f->yfilt[1]+f->yfilt[8])) + (coef_2*(f->yfilt[2]+f->yfilt[7])) + (coef_3*(f->yfilt[3]+f->yfilt[6])) + (coef_4*(f->yfilt[4]+f->yfilt[5]))); - - + + f->mouth_open[9]=f->mouth_open[8]; f->mouth_open[8]=f->mouth_open[7]; f->mouth_open[7]=f->mouth_open[6]; @@ -119,6 +119,6 @@ features->mouth_open=(guint8) ( (coef_0*(f->mouth_open[0]+f->mouth_open[9]))+(coef_1*(f->mouth_open[1]+f->mouth_open[8])) + (coef_2*(f->mouth_open[2]+f->mouth_open[7])) + (coef_3*(f->mouth_open[3]+f->mouth_open[6])) - + (coef_4*(f->mouth_open[4]+f->mouth_open[5]))); - + + (coef_4*(f->mouth_open[4]+f->mouth_open[5]))); + } diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/plugins/crazychat/glm.c --- a/pidgin/plugins/crazychat/glm.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/plugins/crazychat/glm.c Tue Jan 04 06:55:30 2011 +0000 @@ -1,4 +1,4 @@ -/* +/* glm.c */ @@ -25,7 +25,7 @@ /* glmMax: returns the maximum of two floats */ static GLfloat -glmMax(GLfloat a, GLfloat b) +glmMax(GLfloat a, GLfloat b) { if (b > a) return b; @@ -92,14 +92,14 @@ * that works fairly well is 0.000001. * * u - array of 3 GLfloats (GLfloat u[3]) - * v - array of 3 GLfloats (GLfloat v[3]) + * v - array of 3 GLfloats (GLfloat v[3]) */ static GLboolean glmEqual(GLfloat* u, GLfloat* v, GLfloat epsilon) { if (glmAbs(u[0] - v[0]) < epsilon && glmAbs(u[1] - v[1]) < epsilon && - glmAbs(u[2] - v[2]) < epsilon) + glmAbs(u[2] - v[2]) < epsilon) { return GL_TRUE; } @@ -111,7 +111,7 @@ * * vectors - array of GLfloat[3]'s to be welded * numvectors - number of GLfloat[3]'s in vectors - * epsilon - maximum difference between vectors + * epsilon - maximum difference between vectors * */ GLfloat* @@ -534,11 +534,11 @@ for (i = 0; i < model->nummaterials; i++) { material = &model->materials[i]; fprintf(file, "newmtl %s\n", material->name); - fprintf(file, "Ka %f %f %f\n", + fprintf(file, "Ka %f %f %f\n", material->ambient[0], material->ambient[1], material->ambient[2]); - fprintf(file, "Kd %f %f %f\n", + fprintf(file, "Kd %f %f %f\n", material->diffuse[0], material->diffuse[1], material->diffuse[2]); - fprintf(file, "Ks %f %f %f\n", + fprintf(file, "Ks %f %f %f\n", material->specular[0],material->specular[1],material->specular[2]); fprintf(file, "Ns %f\n", material->shininess / 128.0 * 1000.0); fprintf(file, "\n"); @@ -552,10 +552,10 @@ * statistics of the model (such as #vertices, #normals, etc) * * model - properly initialized GLMmodel structure - * file - (fopen'd) file descriptor + * file - (fopen'd) file descriptor */ static GLvoid -glmFirstPass(GLMmodel* model, FILE* file) +glmFirstPass(GLMmodel* model, FILE* file) { GLuint numvertices; /* number of vertices in model */ GLuint numnormals; /* number of normals in model */ @@ -692,10 +692,10 @@ * the data. * * model - properly initialized GLMmodel structure - * file - (fopen'd) file descriptor + * file - (fopen'd) file descriptor */ static GLvoid -glmSecondPass(GLMmodel* model, FILE* file) +glmSecondPass(GLMmodel* model, FILE* file) { GLuint numvertices; /* number of vertices in model */ GLuint numnormals; /* number of normals in model */ @@ -729,21 +729,21 @@ case 'v': /* v, vn, vt */ switch(buf[1]) { case '\0': /* vertex */ - fscanf(file, "%f %f %f", - &vertices[3 * numvertices + 0], - &vertices[3 * numvertices + 1], + fscanf(file, "%f %f %f", + &vertices[3 * numvertices + 0], + &vertices[3 * numvertices + 1], &vertices[3 * numvertices + 2]); numvertices++; break; case 'n': /* normal */ - fscanf(file, "%f %f %f", + fscanf(file, "%f %f %f", &normals[3 * numnormals + 0], - &normals[3 * numnormals + 1], + &normals[3 * numnormals + 1], &normals[3 * numnormals + 2]); numnormals++; break; case 't': /* texcoord */ - fscanf(file, "%f %f", + fscanf(file, "%f %f", &texcoords[2 * numtexcoords + 0], &texcoords[2 * numtexcoords + 1]); numtexcoords++; @@ -888,7 +888,7 @@ * scaling it to fit in a unit cube around the origin. Modelurns the * scalefactor used. * - * model - properly initialized GLMmodel structure + * model - properly initialized GLMmodel structure */ GLfloat glmUnitize(GLMmodel* model) @@ -945,7 +945,7 @@ model->vertices[3 * i + 0] *= scale; model->vertices[3 * i + 1] *= scale; model->vertices[3 * i + 2] *= scale; -*/ +*/ } return scale; @@ -995,7 +995,7 @@ } /* glmScale: Scales a model by a given amount. - * + * * model - properly initialized GLMmodel structure * scale - scalefactor (0.5 = half as large, 2.0 = twice as large) */ @@ -1014,8 +1014,8 @@ /* glmReverseWinding: Reverse the polygon winding for all polygons in * this model. Default winding is counter-clockwise. Also changes * the direction of the normals. - * - * model - properly initialized GLMmodel structure + * + * model - properly initialized GLMmodel structure */ GLvoid glmReverseWinding(GLMmodel* model) @@ -1069,7 +1069,7 @@ GLuint i; GLfloat u[3]; GLfloat v[3]; - + assert(model); assert(model->vertices); @@ -1151,7 +1151,7 @@ members = (GLMnode**)malloc(sizeof(GLMnode*) * (model->numvertices + 1)); for (i = 1; i <= model->numvertices; i++) members[i] = NULL; - + /* for every triangle, create a node for each vertex in it */ for (i = 0; i < model->numtriangles; i++) { node = (GLMnode*)malloc(sizeof(GLMnode)); @@ -1224,11 +1224,11 @@ T(node->index).nindices[2] = avg; } else { /* if this node wasn't averaged, use the facet normal */ - model->normals[3 * numnormals + 0] = + model->normals[3 * numnormals + 0] = model->facetnorms[3 * T(node->index).findex + 0]; - model->normals[3 * numnormals + 1] = + model->normals[3 * numnormals + 1] = model->facetnorms[3 * T(node->index).findex + 1]; - model->normals[3 * numnormals + 2] = + model->normals[3 * numnormals + 2] = model->facetnorms[3 * T(node->index).findex + 2]; if (T(node->index).vindices[0] == i) T(node->index).nindices[0] = numnormals; @@ -1241,7 +1241,7 @@ node = node->next; } } - + model->numnormals = numnormals - 1; /* free the member information */ @@ -1283,16 +1283,16 @@ GLfloat dimensions[3]; GLfloat x, y, scalefactor; GLuint i; - + assert(model); if (model->texcoords) free(model->texcoords); model->numtexcoords = model->numvertices; model->texcoords=(GLfloat*)malloc(sizeof(GLfloat)*2*(model->numtexcoords+1)); - + glmDimensions(model, dimensions); - scalefactor = 2.0 / + scalefactor = 2.0 / glmAbs(glmMax(glmMax(dimensions[0], dimensions[1]), dimensions[2])); /* do the calculations */ @@ -1302,7 +1302,7 @@ model->texcoords[2 * i + 0] = (x + 1.0) / 2.0; model->texcoords[2 * i + 1] = (y + 1.0) / 2.0; } - + /* go through and put texture coordinate indices in all the triangles */ group = model->groups; while(group) { @@ -1310,7 +1310,7 @@ T(group->triangles[i]).tindices[0] = T(group->triangles[i]).vindices[0]; T(group->triangles[i]).tindices[1] = T(group->triangles[i]).vindices[1]; T(group->triangles[i]).tindices[2] = T(group->triangles[i]).vindices[2]; - } + } group = group->next; } @@ -1337,7 +1337,7 @@ GLMgroup* group; GLfloat theta, phi, rho, x, y, z, r; GLuint i; - + assert(model); assert(model->normals); @@ -1345,14 +1345,14 @@ free(model->texcoords); model->numtexcoords = model->numnormals; model->texcoords=(GLfloat*)malloc(sizeof(GLfloat)*2*(model->numtexcoords+1)); - + for (i = 1; i <= model->numnormals; i++) { z = model->normals[3 * i + 0]; /* re-arrange for pole distortion */ y = model->normals[3 * i + 1]; x = model->normals[3 * i + 2]; r = sqrt((x * x) + (y * y)); rho = sqrt((r * r) + (z * z)); - + if(r == 0.0) { theta = 0.0; phi = 0.0; @@ -1367,11 +1367,11 @@ else theta = asin(y / r) + (3.14159265 / 2.0); } - + model->texcoords[2 * i + 0] = theta / 3.14159265; model->texcoords[2 * i + 1] = phi / 3.14159265; } - + /* go through and put texcoord indices in all the triangles */ group = model->groups; while(group) { @@ -1423,9 +1423,9 @@ * Modelurns a pointer to the created object which should be free'd with * glmDelete(). * - * filename - name of the file containing the Wavefront .OBJ format data. + * filename - name of the file containing the Wavefront .OBJ format data. */ -GLMmodel* +GLMmodel* glmReadOBJ(char* filename) { GLMmodel* model; @@ -1504,8 +1504,8 @@ * GLM_TEXTURE - render with texture coords * GLM_COLOR - render with colors (color material) * GLM_MATERIAL - render with materials - * GLM_COLOR and GLM_MATERIAL should not both be specified. - * GLM_FLAT and GLM_SMOOTH should not both be specified. + * GLM_COLOR and GLM_MATERIAL should not both be specified. + * GLM_FLAT and GLM_SMOOTH should not both be specified. */ GLvoid glmWriteOBJ(GLMmodel* model, char* filename, GLuint mode) @@ -1581,7 +1581,7 @@ fprintf(file, "\n"); fprintf(file, "# %d vertices\n", model->numvertices); for (i = 1; i <= model->numvertices; i++) { - fprintf(file, "v %f %f %f\n", + fprintf(file, "v %f %f %f\n", model->vertices[3 * i + 0], model->vertices[3 * i + 1], model->vertices[3 * i + 2]); @@ -1592,7 +1592,7 @@ fprintf(file, "\n"); fprintf(file, "# %d normals\n", model->numnormals); for (i = 1; i <= model->numnormals; i++) { - fprintf(file, "vn %f %f %f\n", + fprintf(file, "vn %f %f %f\n", model->normals[3 * i + 0], model->normals[3 * i + 1], model->normals[3 * i + 2]); @@ -1601,7 +1601,7 @@ fprintf(file, "\n"); fprintf(file, "# %d normals\n", model->numfacetnorms); for (i = 1; i <= model->numnormals; i++) { - fprintf(file, "vn %f %f %f\n", + fprintf(file, "vn %f %f %f\n", model->facetnorms[3 * i + 0], model->facetnorms[3 * i + 1], model->facetnorms[3 * i + 2]); @@ -1613,7 +1613,7 @@ fprintf(file, "\n"); fprintf(file, "# %d texcoords\n", model->texcoords); for (i = 1; i <= model->numtexcoords; i++) { - fprintf(file, "vt %f %f\n", + fprintf(file, "vt %f %f\n", model->texcoords[2 * i + 0], model->texcoords[2 * i + 1]); } @@ -1632,8 +1632,8 @@ for (i = 0; i < group->numtriangles; i++) { if (mode & GLM_SMOOTH && mode & GLM_TEXTURE) { fprintf(file, "f %d/%d/%d %d/%d/%d %d/%d/%d\n", - T(group->triangles[i]).vindices[0], - T(group->triangles[i]).nindices[0], + T(group->triangles[i]).vindices[0], + T(group->triangles[i]).nindices[0], T(group->triangles[i]).tindices[0], T(group->triangles[i]).vindices[1], T(group->triangles[i]).nindices[1], @@ -1663,11 +1663,11 @@ T(group->triangles[i]).nindices[0], T(group->triangles[i]).vindices[1], T(group->triangles[i]).nindices[1], - T(group->triangles[i]).vindices[2], + T(group->triangles[i]).vindices[2], T(group->triangles[i]).nindices[2]); } else if (mode & GLM_FLAT) { fprintf(file, "f %d//%d %d//%d %d//%d\n", - T(group->triangles[i]).vindices[0], + T(group->triangles[i]).vindices[0], T(group->triangles[i]).findex, T(group->triangles[i]).vindices[1], T(group->triangles[i]).findex, @@ -1698,8 +1698,8 @@ * GLM_TEXTURE - render with texture coords * GLM_COLOR - render with colors (color material) * GLM_MATERIAL - render with materials - * GLM_COLOR and GLM_MATERIAL should not both be specified. - * GLM_FLAT and GLM_SMOOTH should not both be specified. + * GLM_COLOR and GLM_MATERIAL should not both be specified. + * GLM_FLAT and GLM_SMOOTH should not both be specified. */ GLvoid glmDraw(GLMmodel* model, GLuint mode) @@ -1778,25 +1778,25 @@ if (mode & GLM_FLAT) glNormal3fv(&model->facetnorms[3 * triangle->findex]); - + if (mode & GLM_SMOOTH) glNormal3fv(&model->normals[3 * triangle->nindices[0]]); if (mode & GLM_TEXTURE) glTexCoord2fv(&model->texcoords[2 * triangle->tindices[0]]); glVertex3fv(&model->vertices[3 * triangle->vindices[0]]); - + if (mode & GLM_SMOOTH) glNormal3fv(&model->normals[3 * triangle->nindices[1]]); if (mode & GLM_TEXTURE) glTexCoord2fv(&model->texcoords[2 * triangle->tindices[1]]); glVertex3fv(&model->vertices[3 * triangle->vindices[1]]); - + if (mode & GLM_SMOOTH) glNormal3fv(&model->normals[3 * triangle->nindices[2]]); if (mode & GLM_TEXTURE) glTexCoord2fv(&model->texcoords[2 * triangle->tindices[2]]); glVertex3fv(&model->vertices[3 * triangle->vindices[2]]); - + } glEnd(); @@ -1815,7 +1815,7 @@ * GLM_TEXTURE - render with texture coords * GLM_COLOR - render with colors (color material) * GLM_MATERIAL - render with materials - * GLM_COLOR and GLM_MATERIAL should not both be specified. + * GLM_COLOR and GLM_MATERIAL should not both be specified. * GLM_FLAT and GLM_SMOOTH should not both be specified. */ GLuint glmList(GLMmodel* model, GLuint mode) @@ -1852,7 +1852,7 @@ copies = glmWeldVectors(vectors, &numvectors, epsilon); #if 0 - printf("glmWeld(): %d redundant vertices.\n", + printf("glmWeld(): %d redundant vertices.\n", model->numvertices - numvectors - 1); #endif @@ -1867,7 +1867,7 @@ /* allocate space for the new vertices */ model->numvertices = numvectors; - model->vertices = (GLfloat*)malloc(sizeof(GLfloat) * + model->vertices = (GLfloat*)malloc(sizeof(GLfloat) * 3 * (model->numvertices + 1)); /* copy the optimized vertices into the actual vertex list */ @@ -1888,7 +1888,7 @@ vectors = model->normals; copies = glmOptimizeVectors(vectors, &numvectors); - printf("glmOptimize(): %d redundant normals.\n", + printf("glmOptimize(): %d redundant normals.\n", model->numnormals - numvectors); for (i = 0; i < model->numtriangles; i++) { @@ -1902,7 +1902,7 @@ /* allocate space for the new normals */ model->numnormals = numvectors; - model->normals = (GLfloat*)malloc(sizeof(GLfloat) * + model->normals = (GLfloat*)malloc(sizeof(GLfloat) * 3 * (model->numnormals + 1)); /* copy the optimized vertices into the actual vertex list */ @@ -1921,7 +1921,7 @@ vectors = model->texcoords; copies = glmOptimizeVectors(vectors, &numvectors); - printf("glmOptimize(): %d redundant texcoords.\n", + printf("glmOptimize(): %d redundant texcoords.\n", model->numtexcoords - numvectors); for (i = 0; i < model->numtriangles; i++) { @@ -1935,7 +1935,7 @@ /* allocate space for the new texcoords */ model->numtexcoords = numvectors; - model->texcoords = (GLfloat*)malloc(sizeof(GLfloat) * + model->texcoords = (GLfloat*)malloc(sizeof(GLfloat) * 2 * (model->numtexcoords + 1)); /* copy the optimized vertices into the actual vertex list */ @@ -1955,8 +1955,8 @@ /* look for unused texcoords */ for (i = 1; i <= model->numvertices; i++) { for (j = 0; j < model->numtriangles; i++) { - if (T(j).vindices[0] == i || - T(j).vindices[1] == i || + if (T(j).vindices[0] == i || + T(j).vindices[1] == i || T(j).vindices[1] == i) break; } diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/plugins/crazychat/main.c --- a/pidgin/plugins/crazychat/main.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/plugins/crazychat/main.c Tue Jan 04 06:55:30 2011 +0000 @@ -16,7 +16,7 @@ int main(void) -{ +{ EnterMovies(); CamProc(); // change this prototype-> no windows fprintf(stderr, "you have just murdered 1000 people."); diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/plugins/crazychat/models.c --- a/pidgin/plugins/crazychat/models.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/plugins/crazychat/models.c Tue Jan 04 06:55:30 2011 +0000 @@ -11,9 +11,9 @@ GLint* temp_lists; GLMmodel** temp_models; char* temp = (char*)malloc(sizeof(char) * (strlen(name) + strlen(".obj" + 3))); - GLMmodel* model; + GLMmodel* model; float dum; - temp_lists = (GLint*)malloc(sizeof(GLint) * num_lists); + temp_lists = (GLint*)malloc(sizeof(GLint) * num_lists); temp_models = (GLMmodel**)malloc(sizeof(GLMmodel*) * num_lists); for(i=0;i=2){ - curr_lid-=2; + curr_lid-=2; } else if(curr_lid==1){ curr_lid--; diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/plugins/crazychat/sharky.c --- a/pidgin/plugins/crazychat/sharky.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/plugins/crazychat/sharky.c Tue Jan 04 06:55:30 2011 +0000 @@ -21,7 +21,7 @@ #define SHARK_IRIS_Y 1.67*SHARK_SCALE//.015 #define SHARK_IRIS_Z 5.0*SHARK_SCALE//.08 #define SHARK_PUP_X 0*SHARK_SCALE -#define SHARK_PUP_Y 0*SHARK_SCALE +#define SHARK_PUP_Y 0*SHARK_SCALE #define SHARK_PUP_Z 2.5*SHARK_SCALE //.028 #define SHARK_IRIS_SCALE .10*SHARK_SCALE #define SHARK_PUP_SCALE .08*SHARK_SCALE @@ -120,7 +120,7 @@ glTranslatef(0, 0, SHARK_EYES_Y); glTranslatef(0, -SHARK_EYES_Z,0); draw_shark_left_eye(f, left_open, max_eye); - draw_shark_right_eye(f, right_open, max_eye); + draw_shark_right_eye(f, right_open, max_eye); glPopMatrix(); } @@ -171,12 +171,12 @@ glmSetMat(f->materials, f->mat_indeces[APPENDAGE]); glCallList(shark->fins[2]); glPopMatrix(); - + } void draw_shark(FACE f, GLfloat angle, GLfloat yangle, BOOL left_open, BOOL right_open, GLfloat open, DIRECTION dir, OUTPUT_MODE mode){ - int next_face; - struct shark_struct* shark; + int next_face; + struct shark_struct* shark; f->crazy_count--; if(f->crazy_count==0){ @@ -198,7 +198,7 @@ glRotatef(-90, 1.0, 0.0, 0.0); glRotatef(-yangle, 0.0, 0.0, -1.0); glRotatef(-angle, 0, 1, 0); - shark_eyes(f, angle, yangle, left_open, right_open, dir); + shark_eyes(f, angle, yangle, left_open, right_open, dir); shark_fins(f, dir); //draw_back_fins(f); glmSetMat(f->materials, f->mat_indeces[HEAD]); @@ -223,10 +223,10 @@ f->name = strdup("sharky"); f->draw_func = draw_shark; shark = (struct shark_struct*)f->char_struct; - + printf("\nReading models: "); fflush(0); - + //initialize the draw lists init_lists(&shark->faces, &shark->m_faces, NUM_SHARKS, f->name, SHARK_HEAD_SCALE); init_lists(&shark->lids, &shark->m_lids, NUM_SHARK_LIDS, "sharkylid", SHARK_LID_SCALE); @@ -237,7 +237,7 @@ printf("\n"); fflush(0); - + shark->curr_face = 0; shark->curr_fin = 1; shark->curr_left_lid = 0; diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/plugins/gestures/stroke-draw.c --- a/pidgin/plugins/gestures/stroke-draw.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/plugins/gestures/stroke-draw.c Tue Jan 04 06:55:30 2011 +0000 @@ -111,7 +111,7 @@ return TRUE; } -static void gstroke_cancel(GdkEvent *event) +static void gstroke_cancel(GdkEvent *event) { last_mouse_position.invalid = TRUE; @@ -145,7 +145,7 @@ * clicked after the middle button is clicked (but possibly * not released) */ - gstroke_cancel(event); + gstroke_cancel(event); original_widget = NULL; break; } @@ -299,7 +299,7 @@ #if 0 purple_debug(PURPLE_DEBUG_MISC, "gestures", "gstroke %s\n", name); #endif - + if (hash_table) { struct gstroke_func_and_data *fd = diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/plugins/gevolution/eds-utils.c --- a/pidgin/plugins/gevolution/eds-utils.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/plugins/gevolution/eds-utils.c Tue Jan 04 06:55:30 2011 +0000 @@ -113,7 +113,7 @@ g_object_unref(addressbooks); } -static EContact * +static EContact * gevo_run_query_in_uri(const gchar *uri, EBookQuery *query) { EBook *book; @@ -169,7 +169,7 @@ * so callers must e_book_query_ref() it in advance (to obtain a * second reference) if they want to reuse @a query. */ -EContact * +EContact * gevo_search_buddy_in_contacts(PurpleBuddy *buddy, EBookQuery *query) { ESourceList *addressbooks; diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/plugins/markerline.c --- a/pidgin/plugins/markerline.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/plugins/markerline.c Tue Jan 04 06:55:30 2011 +0000 @@ -66,7 +66,7 @@ gtk_text_view_get_iter_location(GTK_TEXT_VIEW(widget), &iter, &buf); last_y = buf.y + buf.height; - pad = (gtk_text_view_get_pixels_below_lines(GTK_TEXT_VIEW(widget)) + + pad = (gtk_text_view_get_pixels_below_lines(GTK_TEXT_VIEW(widget)) + gtk_text_view_get_pixels_above_lines(GTK_TEXT_VIEW(widget))) / 2; last_y += pad; } @@ -132,7 +132,7 @@ GList *list; list = pidgin_conv_window_get_gtkconvs(win); - + for (; list; list = list->next) update_marker_for_gtkconv(list->data); diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/plugins/musicmessaging/musicmessaging.c --- a/pidgin/plugins/musicmessaging/musicmessaging.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/plugins/musicmessaging/musicmessaging.c Tue Jan 04 06:55:30 2011 +0000 @@ -49,11 +49,11 @@ GtkWidget *seperator; /* seperator in the conversation */ GtkWidget *button; /* button in the conversation */ GPid pid; /* the pid of the score editor */ - + gboolean started; /* session has started and editor run */ gboolean originator; /* started the mm session */ gboolean requested; /* received a request to start a session */ - + } MMConversation; static gboolean start_session(MMConversation *mmconv); @@ -97,9 +97,9 @@ /* Exported functions */ void music_messaging_change_request(const int session, const char *command, const char *parameters) { - + MMConversation *mmconv = (MMConversation *)g_list_nth_data(conversations, session); - + if (mmconv->started) { if (mmconv->originator) @@ -110,50 +110,50 @@ { GString *to_send = g_string_new(""); g_string_append_printf(to_send, "##MM## request %s %s##MM##", command, parameters); - + purple_conv_im_send(PURPLE_CONV_IM(mmconv->conv), to_send->str); - + purple_debug_misc("musicmessaging", "Sent request: %s\n", to_send->str); } } - + } void music_messaging_change_confirmed(const int session, const char *command, const char *parameters) { - + MMConversation *mmconv = (MMConversation *)g_list_nth_data(conversations, session); - + if (mmconv->started) { if (mmconv->originator) { GString *to_send = g_string_new(""); g_string_append_printf(to_send, "##MM## confirm %s %s##MM##", command, parameters); - + purple_conv_im_send(PURPLE_CONV_IM(mmconv->conv), to_send->str); } else { /* Do nothing. If they aren't the originator, then they can't confirm. */ } } - + } void music_messaging_change_failed(const int session, const char *id, const char *command, const char *parameters) { MMConversation *mmconv = (MMConversation *)g_list_nth_data(conversations, session); - + purple_notify_message(plugin_pointer, PURPLE_NOTIFY_MSG_INFO, command, parameters, NULL, NULL, NULL); - + if (mmconv->started) { if (mmconv->originator) { GString *to_send = g_string_new(""); g_string_append_printf(to_send, "##MM## failed %s %s %s##MM##", id, command, parameters); - + purple_conv_im_send(PURPLE_CONV_IM(mmconv->conv), to_send->str); } else { @@ -165,10 +165,10 @@ void music_messaging_done_session(const int session) { MMConversation *mmconv = (MMConversation *)g_list_nth_data(conversations, session); - + purple_notify_message(plugin_pointer, PURPLE_NOTIFY_MSG_INFO, "Session", "Session Complete", NULL, NULL, NULL); - + session_end(mmconv); } @@ -181,10 +181,10 @@ static gboolean send_change_request (const int session, const char *id, const char *command, const char *parameters) { DBusMessage *message; - + /* Create the signal we need */ message = dbus_message_new_signal (DBUS_PATH_PURPLE, DBUS_INTERFACE_PURPLE, "GscoreChangeRequest"); - + /* Append the string "Ping!" to the signal */ dbus_message_append_args (message, DBUS_TYPE_INT32, &session, @@ -192,42 +192,42 @@ DBUS_TYPE_STRING, &command, DBUS_TYPE_STRING, ¶meters, DBUS_TYPE_INVALID); - + /* Send the signal */ dbus_connection_send (purple_dbus_get_connection(), message, NULL); - + /* Free the signal now we have finished with it */ dbus_message_unref (message); - + /* Tell the user we sent a signal */ g_printerr("Sent change request signal: %d %s %s %s\n", session, id, command, parameters); - + return TRUE; } static gboolean send_change_confirmed (const int session, const char *command, const char *parameters) { DBusMessage *message; - + /* Create the signal we need */ message = dbus_message_new_signal (DBUS_PATH_PURPLE, DBUS_INTERFACE_PURPLE, "GscoreChangeConfirmed"); - + /* Append the string "Ping!" to the signal */ dbus_message_append_args (message, DBUS_TYPE_INT32, &session, DBUS_TYPE_STRING, &command, DBUS_TYPE_STRING, ¶meters, DBUS_TYPE_INVALID); - + /* Send the signal */ dbus_connection_send (purple_dbus_get_connection(), message, NULL); - + /* Free the signal now we have finished with it */ dbus_message_unref (message); - + /* Tell the user we sent a signal */ g_printerr("Sent change confirmed signal.\n"); - + return TRUE; } @@ -238,7 +238,7 @@ GList *l; MMConversation *mmconv_current = NULL; guint i; - + i = 0; for (l = conversations; l != NULL; l = l->next) { @@ -268,36 +268,36 @@ main purple dbus loop. Without this statement, the purple dbus code wouldn't know about our functions. */ PURPLE_DBUS_REGISTER_BINDINGS(plugin); - + /* Keep the plugin for reference (needed for notify's) */ plugin_pointer = plugin; - + /* Add the button to all the current conversations */ purple_conversation_foreach (init_conversation); - + /* Listen for any new conversations */ conv_list_handle = purple_conversations_get_handle(); - - purple_signal_connect(conv_list_handle, "conversation-created", + + purple_signal_connect(conv_list_handle, "conversation-created", plugin, PURPLE_CALLBACK(init_conversation), NULL); - + /* Listen for conversations that are ending */ purple_signal_connect(conv_list_handle, "deleting-conversation", plugin, PURPLE_CALLBACK(conv_destroyed), NULL); - + /* Listen for sending/receiving messages to replace tags */ purple_signal_connect(conv_list_handle, "sending-im-msg", plugin, PURPLE_CALLBACK(intercept_sent), NULL); purple_signal_connect(conv_list_handle, "receiving-im-msg", plugin, PURPLE_CALLBACK(intercept_received), NULL); - + return TRUE; } static gboolean plugin_unload(PurplePlugin *plugin) { MMConversation *mmconv = NULL; - + while (conversations != NULL) { mmconv = conversations->data; @@ -353,7 +353,7 @@ intercept_received(PurpleAccount *account, char **sender, char **message, PurpleConversation *conv, int *flags) { MMConversation *mmconv; - + if (conv == NULL) { /* XXX: This is just to avoid a crash (#2726). * We may want to create the conversation instead of returning from here @@ -362,13 +362,13 @@ } mmconv = mmconv_from_conv(conv); - + purple_debug_misc("purple-musicmessaging", "Intercepted: %s\n", *message); if (strstr(*message, MUSICMESSAGING_PREFIX)) { char *parsed_message = strtok(strstr(*message, MUSICMESSAGING_PREFIX), "<"); purple_debug_misc("purple-musicmessaging", "Received an MM Message: %s\n", parsed_message); - + if (mmconv->started) { if (strstr(parsed_message, "request")) @@ -379,18 +379,18 @@ char *id = (mmconv->conv)->name; char *command; char *parameters; - + purple_debug_misc("purple-musicmessaging", "Sending request to gscore.\n"); - + /* Get past the first two terms - '##MM##' and 'request' */ strtok(parsed_message, " "); /* '##MM##' */ strtok(NULL, " "); /* 'request' */ - + command = strtok(NULL, " "); parameters = strtok(NULL, "#"); - + send_change_request (session, id, command, parameters); - + } } else if (strstr(parsed_message, "confirm")) { @@ -399,40 +399,40 @@ int session = mmconv_from_conv_loc(conv); char *command; char *parameters; - + purple_debug_misc("purple-musicmessaging", "Sending confirmation to gscore.\n"); - + /* Get past the first two terms - '##MM##' and 'confirm' */ strtok(parsed_message, " "); /* '##MM##' */ strtok(NULL, " "); /* 'confirm' */ - + command = strtok(NULL, " "); parameters = strtok(NULL, "#"); - + send_change_confirmed (session, command, parameters); } } else if (strstr(parsed_message, "failed")) { char *id; char *command; - + /* Get past the first two terms - '##MM##' and 'confirm' */ strtok(parsed_message, " "); /* '##MM##' */ strtok(NULL, " "); /* 'failed' */ - + id = strtok(NULL, " "); command = strtok(NULL, " "); /* char *parameters = strtok(NULL, "#"); DONT NEED PARAMETERS */ - + if ((mmconv->conv)->name == id) { - purple_notify_message(plugin_pointer, PURPLE_NOTIFY_MSG_ERROR, + purple_notify_message(plugin_pointer, PURPLE_NOTIFY_MSG_ERROR, _("Music Messaging"), _("There was a conflict in running the command:"), command, NULL, NULL); } } } - + message = 0; } else if (strstr(*message, MUSICMESSAGING_START_MSG)) @@ -443,12 +443,12 @@ mmconv->requested = TRUE; return FALSE; } - + } else if (strstr(*message, MUSICMESSAGING_CONFIRM_MSG)) { purple_debug_misc("purple-musicmessagin", "Received MM confirm.\n"); - + if (mmconv->originator) { start_session(mmconv); @@ -476,11 +476,11 @@ const char *convName = purple_conversation_get_name(mmconv->conv); serv_send_im(connection, convName, MUSICMESSAGING_CONFIRM_MSG, PURPLE_MESSAGE_SEND); } - + static gboolean start_session(MMConversation *mmconv) -{ +{ run_editor(mmconv); return TRUE; } @@ -496,7 +496,7 @@ static void music_button_toggled (GtkWidget *widget, gpointer data) { MMConversation *mmconv = mmconv_from_conv(((MMConversation *) data)->conv); - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) { if (((MMConversation *) data)->requested) { @@ -517,7 +517,7 @@ { const char * path = gtk_entry_get_text((GtkEntry*)text_field); purple_prefs_set_string("/plugins/gtk/musicmessaging/editor_path", path); - + } static void run_editor (MMConversation *mmconv) @@ -526,14 +526,14 @@ GString *session_id; gchar * args[4]; args[0] = (gchar *)purple_prefs_get_string("/plugins/gtk/musicmessaging/editor_path"); - + args[1] = "-session_id"; session_id = g_string_new(""); g_string_append_printf(session_id, "%d", mmconv_from_conv_loc(mmconv->conv)); args[2] = session_id->str; - + args[3] = NULL; - + if (!(g_spawn_async (".", args, NULL, 4, NULL, NULL, &(mmconv->pid), &spawn_error))) { purple_notify_error(plugin_pointer, _("Error Running Editor"), @@ -559,21 +559,21 @@ { MMConversation *mmconv; mmconv = g_malloc(sizeof(MMConversation)); - + mmconv->conv = conv; mmconv->started = FALSE; mmconv->originator = FALSE; mmconv->requested = FALSE; - + add_button(mmconv); - + conversations = g_list_append(conversations, mmconv); } static void conv_destroyed (PurpleConversation *conv) { MMConversation *mmconv = mmconv_from_conv(conv); - + remove_widget(mmconv->button); remove_widget(mmconv->seperator); if (mmconv->started) @@ -586,7 +586,7 @@ static void add_button (MMConversation *mmconv) { PurpleConversation *conv = mmconv->conv; - + GtkWidget *button, *image, *sep; gchar *file_path; @@ -601,16 +601,16 @@ g_free(file_path); gtk_container_add((GtkContainer *)button, image); - + sep = gtk_vseparator_new(); - + mmconv->seperator = sep; mmconv->button = button; - + gtk_widget_show(sep); gtk_widget_show(image); gtk_widget_show(button); - + gtk_box_pack_start(GTK_BOX(PIDGIN_CONVERSATION(conv)->toolbar), sep, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(PIDGIN_CONVERSATION(conv)->toolbar), button, FALSE, FALSE, 0); } @@ -618,7 +618,7 @@ static void remove_widget (GtkWidget *button) { gtk_widget_hide(button); - gtk_widget_destroy(button); + gtk_widget_destroy(button); } static GtkWidget * @@ -626,32 +626,32 @@ { GtkWidget *ret; GtkWidget *vbox; - + GtkWidget *editor_path; GtkWidget *editor_path_label; GtkWidget *editor_path_button; - + /* Outside container */ ret = gtk_vbox_new(FALSE, 18); gtk_container_set_border_width(GTK_CONTAINER(ret), 10); /* Configuration frame */ vbox = pidgin_make_frame(ret, _("Music Messaging Configuration")); - + /* Path to the score editor */ editor_path = gtk_entry_new(); editor_path_label = gtk_label_new(_("Score Editor Path")); editor_path_button = gtk_button_new_with_mnemonic(_("_Apply")); - + gtk_entry_set_text((GtkEntry*)editor_path, "/usr/local/bin/gscore"); - + g_signal_connect(G_OBJECT(editor_path_button), "clicked", G_CALLBACK(set_editor_path), editor_path); - + gtk_box_pack_start(GTK_BOX(vbox), editor_path_label, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox), editor_path, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox), editor_path_button, FALSE, FALSE, 0); - + gtk_widget_show_all(ret); return ret; diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/plugins/relnot.c --- a/pidgin/plugins/relnot.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/plugins/relnot.c Tue Jan 04 06:55:30 2011 +0000 @@ -133,7 +133,7 @@ if(!last_check || time(NULL) - last_check > MIN_CHECK_INTERVAL) { gchar *url, *request; const char *host = "pidgin.im"; - + url = g_strdup_printf("http://%s/version.php?version=%s&build=%s", host, purple_core_get_version(), diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/plugins/sendbutton.c --- a/pidgin/plugins/sendbutton.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/plugins/sendbutton.c Tue Jan 04 06:55:30 2011 +0000 @@ -74,7 +74,7 @@ GINT_TO_POINTER(signal_id)); input_buffer_changed(buf, send_button); } - + g_object_set_data(G_OBJECT(gtkconv->lower_hbox), "send_button", send_button); } @@ -128,7 +128,7 @@ */ while (convs) { - + PurpleConversation *conv = (PurpleConversation *)convs->data; /* Setup Send button */ diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/plugins/ticker/ticker.c --- a/pidgin/plugins/ticker/ticker.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/plugins/ticker/ticker.c Tue Jan 04 06:55:30 2011 +0000 @@ -1,6 +1,6 @@ /* * Purple Ticker Plugin - * The line below doesn't apply at all, does it? It should be Syd, Sean, and + * The line below doesn't apply at all, does it? It should be Syd, Sean, and * maybe Nathan, I believe. * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald * diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/plugins/vvconfig.c --- a/pidgin/plugins/vvconfig.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/plugins/vvconfig.c Tue Jan 04 06:55:30 2011 +0000 @@ -124,7 +124,7 @@ ret = g_list_reverse(ret); return ret; } - + for (n=0; n < array->n_values; ++n) { GValue *device; const gchar *name; @@ -152,7 +152,7 @@ } } gst_object_unref(element); - + ret = g_list_prepend(ret, NULL); ret = g_list_reverse(ret); @@ -527,12 +527,12 @@ GtkWidget *hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER); GtkWidget *config_frame = get_plugin_config_frame(NULL); GtkWidget *close = gtk_button_new_from_stock(GTK_STOCK_CLOSE); - + gtk_container_add(GTK_CONTAINER(vbox), config_frame); gtk_container_add(GTK_CONTAINER(vbox), hbox); window = pidgin_create_window(_("Voice/Video Settings"), PIDGIN_HIG_BORDER, NULL, TRUE); - g_signal_connect(G_OBJECT(window), "destroy", + g_signal_connect(G_OBJECT(window), "destroy", G_CALLBACK(config_destroy), NULL); g_signal_connect(G_OBJECT(close), "clicked", G_CALLBACK(config_close), NULL); diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/plugins/win32/winprefs/gtkappbar.c --- a/pidgin/plugins/win32/winprefs/gtkappbar.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/plugins/win32/winprefs/gtkappbar.c Tue Jan 04 06:55:30 2011 +0000 @@ -167,7 +167,7 @@ SetWindowLong(hwnd, GWL_EXSTYLE, style); SetWindowPos(hwnd, 0, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); - + /* This really should be the following, but SWP_FRAMECHANGED strangely causes initermittent problems "Show Desktop" done more than once. * Not having SWP_FRAMECHANGED *should* cause the Style not to be applied, but i haven't noticed any problems * SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED); diff -r 44f53d3fc54f -r a8cc50c2279f pidgin/win32/gtkdocklet-win32.c --- a/pidgin/win32/gtkdocklet-win32.c Tue Jan 04 06:42:45 2011 +0000 +++ b/pidgin/win32/gtkdocklet-win32.c Tue Jan 04 06:55:30 2011 +0000 @@ -539,7 +539,7 @@ icon_name = PIDGIN_STOCK_TRAY_PENDING; if (connecting) icon_name = PIDGIN_STOCK_TRAY_CONNECT; - + g_return_if_fail(icon_name != NULL); cached_icons[icon_index] = load_hicon_from_stock(icon_name); @@ -558,7 +558,7 @@ wchar_t *w; if (value == NULL) { value = PIDGIN_NAME; - } + } w = g_utf8_to_utf16(value, -1, NULL, NULL, NULL); wcsncpy(_nicon_data.szTip, w, sizeof(_nicon_data.szTip) / sizeof(wchar_t)); g_free(w);