Mercurial > pidgin

comparison pidgin/plugins/xmppconsole.c @ 32696:763d65f3f758

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
explicit merge of '6ab9f5ff810acde3c06a2add7b8df2bd75cce6e3' and '7a0bb807afc9c1c3f2aaa7143fc5d1e3dc7c6ee8' to branch 'im.pidgin.cpw.qulogic.gtk3'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Fri, 23 Dec 2011 06:58:52 +0000
parents 9bbbd4a7dcea 457443ca22e0
children 58a36b827f45
comparison
equal deleted inserted replaced
32418:466efc330d3d 32696:763d65f3f758
272 GTK_STOCK_CANCEL, 272 GTK_STOCK_CANCEL,
273 GTK_RESPONSE_REJECT, 273 GTK_RESPONSE_REJECT,
274 GTK_STOCK_OK, 274 GTK_STOCK_OK,
275 GTK_RESPONSE_ACCEPT, 275 GTK_RESPONSE_ACCEPT,
276 NULL); 276 NULL);
277 #if !GTK_CHECK_VERSION(2,22,0)
277 gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE); 278 gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
279 #endif
278 gtk_dialog_set_default_response (GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT); 280 gtk_dialog_set_default_response (GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT);
279 gtk_container_set_border_width(GTK_CONTAINER(dialog), 12); 281 gtk_container_set_border_width(GTK_CONTAINER(dialog), 12);
280 #if GTK_CHECK_VERSION(2,14,0) 282 #if GTK_CHECK_VERSION(2,14,0)
281 vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog)); 283 vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
282 #else 284 #else
360 GTK_STOCK_CANCEL, 362 GTK_STOCK_CANCEL,
361 GTK_RESPONSE_REJECT, 363 GTK_RESPONSE_REJECT,
362 GTK_STOCK_OK, 364 GTK_STOCK_OK,
363 GTK_RESPONSE_ACCEPT, 365 GTK_RESPONSE_ACCEPT,
364 NULL); 366 NULL);
367 #if !GTK_CHECK_VERSION(2,22,0)
365 gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE); 368 gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
369 #endif
366 gtk_dialog_set_default_response (GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT); 370 gtk_dialog_set_default_response (GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT);
367 gtk_container_set_border_width(GTK_CONTAINER(dialog), 12); 371 gtk_container_set_border_width(GTK_CONTAINER(dialog), 12);
368 #if GTK_CHECK_VERSION(2,14,0) 372 #if GTK_CHECK_VERSION(2,14,0)
369 vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog)); 373 vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
370 #else 374 #else
518 GTK_STOCK_CANCEL, 522 GTK_STOCK_CANCEL,
519 GTK_RESPONSE_REJECT, 523 GTK_RESPONSE_REJECT,
520 GTK_STOCK_OK, 524 GTK_STOCK_OK,
521 GTK_RESPONSE_ACCEPT, 525 GTK_RESPONSE_ACCEPT,
522 NULL); 526 NULL);
527 #if !GTK_CHECK_VERSION(2,22,0)
523 gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE); 528 gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
529 #endif
524 gtk_dialog_set_default_response (GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT); 530 gtk_dialog_set_default_response (GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT);
525 gtk_container_set_border_width(GTK_CONTAINER(dialog), 12); 531 gtk_container_set_border_width(GTK_CONTAINER(dialog), 12);
526 #if GTK_CHECK_VERSION(2,14,0) 532 #if GTK_CHECK_VERSION(2,14,0)
527 vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog)); 533 vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
528 #else 534 #else