Mercurial > pidgin.yaz
comparison pidgin/plugins/disco/gtkdisco.c @ 27165:8671d9a37002
Fix merge error.
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Mon, 08 Jun 2009 04:42:33 +0000 |
parents | f7ef790f3a44 |
children | abf989278782 |
comparison
equal
deleted
inserted
replaced
27164:f7ef790f3a44 | 27165:8671d9a37002 |
---|---|
293 if (gtk_tree_view_row_expanded(GTK_TREE_VIEW(pdl->tree), path)) | 293 if (gtk_tree_view_row_expanded(GTK_TREE_VIEW(pdl->tree), path)) |
294 gtk_tree_view_collapse_row(GTK_TREE_VIEW(pdl->tree), path); | 294 gtk_tree_view_collapse_row(GTK_TREE_VIEW(pdl->tree), path); |
295 else | 295 else |
296 gtk_tree_view_expand_row(GTK_TREE_VIEW(pdl->tree), path, FALSE); | 296 gtk_tree_view_expand_row(GTK_TREE_VIEW(pdl->tree), path, FALSE); |
297 else if (service->flags & XMPP_DISCO_ADD) | 297 else if (service->flags & XMPP_DISCO_ADD) |
298 add_room_to_blist_cb(GTK_BUTTON(pdl->dialog->add_button), pdl->dialog); | 298 add_to_blist_cb(GTK_BUTTON(pdl->dialog->add_button), pdl->dialog); |
299 else if (service->flags & XMPP_DISCO_REGISTER) | 299 else if (service->flags & XMPP_DISCO_REGISTER) |
300 register_button_cb(GTK_BUTTON(pdl->dialog->register_button), pdl->dialog); | 300 register_button_cb(GTK_BUTTON(pdl->dialog->register_button), pdl->dialog); |
301 } | 301 } |
302 | 302 |
303 static void | 303 static void |