# HG changeset patch # User Richard Laager # Date 1145425850 0 # Node ID b76c6de0c3b53cd590f9c3cd8bdbc5d49e6cdb7a # Parent b198d0c26b834113b4f025695455276861a3d2d4 [gaim-migrate @ 16065] Kill a number of trivial UNUSED_VALUE "defects": CID 155 CID 156 CID 157 CID 158 CID 159 CID 160 CID 161 CID 162 CID 163 CID 165 CID 166 CID 167 CID 173 CID 174 CID 177 committer: Tailor Script diff -r b198d0c26b83 -r b76c6de0c3b5 plugins/notify.c --- a/plugins/notify.c Wed Apr 19 03:31:47 2006 +0000 +++ b/plugins/notify.c Wed Apr 19 05:50:50 2006 +0000 @@ -591,7 +591,7 @@ static void apply_method() { - GList *convs = gaim_get_conversations(); + GList *convs; GaimGtkWindow *gaimwin = NULL; for (convs = gaim_get_conversations(); convs != NULL; convs = convs->next) { diff -r b198d0c26b83 -r b76c6de0c3b5 src/conversation.c --- a/src/conversation.c Wed Apr 19 03:31:47 2006 +0000 +++ b/src/conversation.c Wed Apr 19 05:50:50 2006 +0000 @@ -90,7 +90,6 @@ GaimConversationType type; GaimAccount *account; GaimConnection *gc; - GaimConversationUiOps *ops; char *displayed = NULL, *sent = NULL; int err = 0; @@ -104,7 +103,6 @@ g_return_if_fail(gc != NULL); type = gaim_conversation_get_type(conv); - ops = gaim_conversation_get_ui_ops(conv); /* Always linkfy the text for display */ displayed = gaim_markup_linkify(message); diff -r b198d0c26b83 -r b76c6de0c3b5 src/gtkconv.c --- a/src/gtkconv.c Wed Apr 19 03:31:47 2006 +0000 +++ b/src/gtkconv.c Wed Apr 19 05:50:50 2006 +0000 @@ -447,11 +447,9 @@ GaimGtkConversation *gtkconv; char *cmd; const char *prefix; - GaimAccount *account; GtkTextIter start; gtkconv = GAIM_GTK_CONVERSATION(conv); - account = gaim_conversation_get_account(conv); prefix = gaim_gtk_get_cmd_prefix(); cmd = gtk_imhtml_get_text(GTK_IMHTML(gtkconv->entry), NULL, NULL); @@ -2235,8 +2233,6 @@ { GaimGtkConversation *gtkconv; GaimGtkWindow *win; - GaimAccount *account; - const char *name; GdkPixbuf *status = NULL; g_return_if_fail(conv != NULL); @@ -2246,9 +2242,6 @@ if (conv != gtkconv->active_conv) return; - name = gaim_conversation_get_name(conv); - account = gaim_conversation_get_account(conv); - status = gaim_gtkconv_get_tab_icon(conv, TRUE); g_return_if_fail(status != NULL); @@ -6265,9 +6258,6 @@ account_signed_off_cb(GaimConnection *gc, gpointer event) { GList *iter; - GaimAccount *account; - - account = gaim_connection_get_account(gc); for (iter = gaim_get_conversations(); iter; iter = iter->next) { @@ -7504,13 +7494,11 @@ GtkWidget *tab_cont = gtkconv->tab_cont; GtkWidget *close_image; GaimConversationType conv_type; - const char *name; const gchar *tmp_lab; gint close_button_width, close_button_height, focus_width, focus_pad; gboolean tabs_side = FALSE; gint angle = 0; - name = gaim_conversation_get_name(conv); conv_type = gaim_conversation_get_type(conv); diff -r b198d0c26b83 -r b76c6de0c3b5 src/gtkdebug.c --- a/src/gtkdebug.c Wed Apr 19 03:31:47 2006 +0000 +++ b/src/gtkdebug.c Wed Apr 19 05:50:50 2006 +0000 @@ -693,7 +693,7 @@ /* Pause */ image = gtk_image_new_from_stock(GAIM_STOCK_PAUSE, GTK_ICON_SIZE_MENU); - button = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), + gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL, _("Pause"), _("Pause"), NULL, image, diff -r b198d0c26b83 -r b76c6de0c3b5 src/gtkprefs.c --- a/src/gtkprefs.c Wed Apr 19 03:31:47 2006 +0000 +++ b/src/gtkprefs.c Wed Apr 19 05:50:50 2006 +0000 @@ -963,7 +963,7 @@ { GtkWidget *ret; GtkWidget *vbox, *hbox, *entry; - GtkWidget *table, *label, *auto_ip_checkbox, *ports_checkbox, *spin_button, *stun_server_entry; + GtkWidget *table, *label, *auto_ip_checkbox, *ports_checkbox, *spin_button; GtkSizeGroup *sg; GaimProxyInfo *proxy_info = NULL; @@ -972,7 +972,7 @@ vbox = gaim_gtk_make_frame (ret, _("IP Address")); - stun_server_entry = gaim_gtk_prefs_labeled_entry(vbox,_("ST_UN server:"), "/core/network/stun_server", NULL); + gaim_gtk_prefs_labeled_entry(vbox,_("ST_UN server:"), "/core/network/stun_server", NULL); auto_ip_checkbox = gaim_gtk_prefs_checkbox(_("_Autodetect IP address"), "/core/network/auto_ip", vbox); diff -r b198d0c26b83 -r b76c6de0c3b5 src/gtksavedstatuses.c --- a/src/gtksavedstatuses.c Wed Apr 19 03:31:47 2006 +0000 +++ b/src/gtksavedstatuses.c Wed Apr 19 05:50:50 2006 +0000 @@ -880,7 +880,6 @@ renderer, "active", STATUS_EDITOR_COLUMN_ENABLE_SUBSTATUS, NULL); - column = gtk_tree_view_get_column(GTK_TREE_VIEW(dialog->treeview), 1); g_signal_connect(G_OBJECT(renderer), "toggled", G_CALLBACK(status_editor_substatus_cb), dialog); diff -r b198d0c26b83 -r b76c6de0c3b5 src/idle.c --- a/src/idle.c Wed Apr 19 03:31:47 2006 +0000 +++ b/src/idle.c Wed Apr 19 05:50:50 2006 +0000 @@ -93,12 +93,10 @@ { GaimAccount *account; GaimPresence *presence; - GaimStatus *status; GaimSavedStatus *saved_status; account = gaim_connection_get_account(gc); presence = gaim_account_get_presence(account); - status = gaim_presence_get_active_status(presence); if (!gc->is_auto_away) /* This account is already not auto-away! */ diff -r b198d0c26b83 -r b76c6de0c3b5 src/server.c --- a/src/server.c Wed Apr 19 03:31:47 2006 +0000 +++ b/src/server.c Wed Apr 19 05:50:50 2006 +0000 @@ -725,9 +725,6 @@ GSList *bcs; GaimConversation *conv = NULL; GaimConvChat *chat = NULL; - GaimAccount *account; - - account = gaim_connection_get_account(g); for (bcs = g->buddy_chats; bcs != NULL; bcs = bcs->next) { conv = (GaimConversation *)bcs->data; diff -r b198d0c26b83 -r b76c6de0c3b5 src/sslconn.c --- a/src/sslconn.c Wed Apr 19 03:31:47 2006 +0000 +++ b/src/sslconn.c Wed Apr 19 05:50:50 2006 +0000 @@ -120,13 +120,9 @@ gaim_ssl_input_add(GaimSslConnection *gsc, GaimSslInputFunction func, void *data) { - GaimSslOps *ops; - g_return_if_fail(func != NULL); g_return_if_fail(gaim_ssl_is_supported()); - ops = gaim_ssl_get_ops(); - gsc->recv_cb_data = data; gsc->recv_cb = func; diff -r b198d0c26b83 -r b76c6de0c3b5 src/status.c --- a/src/status.c Wed Apr 19 03:31:47 2006 +0000 +++ b/src/status.c Wed Apr 19 05:50:50 2006 +0000 @@ -864,14 +864,11 @@ gaim_status_set_attr_boolean(GaimStatus *status, const char *id, gboolean value) { - GaimStatusType *status_type; GaimValue *attr_value; g_return_if_fail(status != NULL); g_return_if_fail(id != NULL); - status_type = gaim_status_get_type(status); - /* Make sure this attribute exists and is the correct type. */ attr_value = gaim_status_get_attr_value(status, id); g_return_if_fail(attr_value != NULL); @@ -883,14 +880,11 @@ void gaim_status_set_attr_int(GaimStatus *status, const char *id, int value) { - GaimStatusType *status_type; GaimValue *attr_value; g_return_if_fail(status != NULL); g_return_if_fail(id != NULL); - status_type = gaim_status_get_type(status); - /* Make sure this attribute exists and is the correct type. */ attr_value = gaim_status_get_attr_value(status, id); g_return_if_fail(attr_value != NULL); @@ -903,14 +897,11 @@ gaim_status_set_attr_string(GaimStatus *status, const char *id, const char *value) { - GaimStatusType *status_type; GaimValue *attr_value; g_return_if_fail(status != NULL); g_return_if_fail(id != NULL); - status_type = gaim_status_get_type(status); - /* Make sure this attribute exists and is the correct type. */ attr_value = gaim_status_get_attr_value(status, id); /* This used to be g_return_if_fail, but it's failing a LOT, so