comparison: pidgin/gtkdebug.c
pidgin/gtkdebug.c
- branch
- release-2.x.y
- changeset 36256
- a437550a9308
- parent 31294
- 73607ab89c6f
- child 36257
- c5445f25f90f
equal
deleted
inserted
replaced
| 36255:a3fe30a2666b | 36256:a437550a9308 |
|---|---|
| 427 gchar *text; | 427 gchar *text; |
| 428 PurpleDebugLevel level; | 428 PurpleDebugLevel level; |
| 429 | 429 |
| 430 gtk_tree_model_get(m, iter, 0, &text, 1, &level, -1); | 430 gtk_tree_model_get(m, iter, 0, &text, 1, &level, -1); |
| 431 | 431 |
| 432 if (level >= purple_prefs_get_int(PIDGIN_PREFS_ROOT "/debug/filterlevel")) | 432 if (level >= (PurpleDebugLevel)purple_prefs_get_int(PIDGIN_PREFS_ROOT "/debug/filterlevel")) |
| 433 regex_match(win, text); | 433 regex_match(win, text); |
| 434 | 434 |
| 435 g_free(text); | 435 g_free(text); |
| 436 | 436 |
| 437 return FALSE; | 437 return FALSE; |
| 455 DebugWindow *win = (DebugWindow *)data; | 455 DebugWindow *win = (DebugWindow *)data; |
| 456 gchar *text; | 456 gchar *text; |
| 457 PurpleDebugLevel level; | 457 PurpleDebugLevel level; |
| 458 | 458 |
| 459 gtk_tree_model_get(m, iter, 0, &text, 1, &level, -1); | 459 gtk_tree_model_get(m, iter, 0, &text, 1, &level, -1); |
| 460 if (level >= purple_prefs_get_int(PIDGIN_PREFS_ROOT "/debug/filterlevel")) | 460 if (level >= (PurpleDebugLevel)purple_prefs_get_int(PIDGIN_PREFS_ROOT "/debug/filterlevel")) |
| 461 gtk_imhtml_append_text(GTK_IMHTML(win->text), text, 0); | 461 gtk_imhtml_append_text(GTK_IMHTML(win->text), text, 0); |
| 462 g_free(text); | 462 g_free(text); |
| 463 | 463 |
| 464 return FALSE; | 464 return FALSE; |
| 465 } | 465 } |
| 582 if(win->paused) | 582 if(win->paused) |
| 583 return; | 583 return; |
| 584 | 584 |
| 585 gtk_tree_model_get(model, iter, 0, &text, 1, &level, -1); | 585 gtk_tree_model_get(model, iter, 0, &text, 1, &level, -1); |
| 586 | 586 |
| 587 if (level >= purple_prefs_get_int(PIDGIN_PREFS_ROOT "/debug/filterlevel")) { | 587 if (level >= (PurpleDebugLevel)purple_prefs_get_int(PIDGIN_PREFS_ROOT "/debug/filterlevel")) { |
| 588 if(gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(win->filter))) { | 588 if(gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(win->filter))) { |
| 589 regex_match(win, text); | 589 regex_match(win, text); |
| 590 } else { | 590 } else { |
| 591 gtk_imhtml_append_text(GTK_IMHTML(win->text), text, 0); | 591 gtk_imhtml_append_text(GTK_IMHTML(win->text), text, 0); |
| 592 } | 592 } |
| 720 | 720 |
| 721 for (i = 0; i < 3; i++) { | 721 for (i = 0; i < 3; i++) { |
| 722 item = gtk_check_menu_item_new_with_mnemonic(text[i]); | 722 item = gtk_check_menu_item_new_with_mnemonic(text[i]); |
| 723 g_object_set_data(G_OBJECT(item), "user_data", GINT_TO_POINTER(value[i])); | 723 g_object_set_data(G_OBJECT(item), "user_data", GINT_TO_POINTER(value[i])); |
| 724 g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(toolbar_icon_pref_changed), toolbar); | 724 g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(toolbar_icon_pref_changed), toolbar); |
| 725 if (value[i] == purple_prefs_get_int(PIDGIN_PREFS_ROOT "/debug/style")) | 725 if (value[i] == (GtkToolbarStyle)purple_prefs_get_int(PIDGIN_PREFS_ROOT "/debug/style")) |
| 726 gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), TRUE); | 726 gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), TRUE); |
| 727 gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); | 727 gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); |
| 728 } | 728 } |
| 729 | 729 |
| 730 gtk_widget_show_all(menu); | 730 gtk_widget_show_all(menu); |
