comparison: pidgin/gtkrequest.c
pidgin/gtkrequest.c
- branch
- string-comparison-r2
- changeset 38258
- 9a6551eba09c
- parent 36256
- a437550a9308
- child 38259
- c593fc9f5438
equal
deleted
inserted
replaced
| 38257:1a294a6d2a57 | 38258:9a6551eba09c |
|---|---|
| 131 gtk_text_view_get_buffer(GTK_TEXT_VIEW(data->u.input.entry)); | 131 gtk_text_view_get_buffer(GTK_TEXT_VIEW(data->u.input.entry)); |
| 132 | 132 |
| 133 gtk_text_buffer_get_start_iter(buffer, &start_iter); | 133 gtk_text_buffer_get_start_iter(buffer, &start_iter); |
| 134 gtk_text_buffer_get_end_iter(buffer, &end_iter); | 134 gtk_text_buffer_get_end_iter(buffer, &end_iter); |
| 135 | 135 |
| 136 if ((data->u.input.hint != NULL) && (!strcmp(data->u.input.hint, "html"))) | 136 if ((data->u.input.hint != NULL) && (purple_strequal(data->u.input.hint, "html"))) |
| 137 multiline_value = gtk_imhtml_get_markup(GTK_IMHTML(data->u.input.entry)); | 137 multiline_value = gtk_imhtml_get_markup(GTK_IMHTML(data->u.input.entry)); |
| 138 else | 138 else |
| 139 multiline_value = gtk_text_buffer_get_text(buffer, &start_iter, &end_iter, | 139 multiline_value = gtk_text_buffer_get_text(buffer, &start_iter, &end_iter, |
| 140 FALSE); | 140 FALSE); |
| 141 | 141 |
| 287 return FALSE; | 287 return FALSE; |
| 288 } | 288 } |
| 289 | 289 |
| 290 | 290 |
| 291 #define STOCK_ITEMIZE(r, l) \ | 291 #define STOCK_ITEMIZE(r, l) \ |
| 292 if (!strcmp((r), text)) \ | 292 if (purple_strequal((r), text)) \ |
| 293 return (l); | 293 return (l); |
| 294 | 294 |
| 295 static const char * | 295 static const char * |
| 296 text_to_stock(const char *text) | 296 text_to_stock(const char *text) |
| 297 { | 297 { |
| 401 data->u.input.multiline = multiline; | 401 data->u.input.multiline = multiline; |
| 402 data->u.input.hint = g_strdup(hint); | 402 data->u.input.hint = g_strdup(hint); |
| 403 | 403 |
| 404 gtk_widget_show_all(hbox); | 404 gtk_widget_show_all(hbox); |
| 405 | 405 |
| 406 if ((data->u.input.hint != NULL) && (!strcmp(data->u.input.hint, "html"))) { | 406 if ((data->u.input.hint != NULL) && (purple_strequal(data->u.input.hint, "html"))) { |
| 407 GtkWidget *frame; | 407 GtkWidget *frame; |
| 408 | 408 |
| 409 /* imhtml */ | 409 /* imhtml */ |
| 410 frame = pidgin_create_imhtml(TRUE, &entry, &toolbar, NULL); | 410 frame = pidgin_create_imhtml(TRUE, &entry, &toolbar, NULL); |
| 411 gtk_widget_set_size_request(entry, 320, 130); | 411 gtk_widget_set_size_request(entry, 320, 130); |
| 433 gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(entry), GTK_WRAP_WORD_CHAR); | 433 gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(entry), GTK_WRAP_WORD_CHAR); |
| 434 | 434 |
| 435 if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/spellcheck")) | 435 if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/spellcheck")) |
| 436 pidgin_setup_gtkspell(GTK_TEXT_VIEW(entry)); | 436 pidgin_setup_gtkspell(GTK_TEXT_VIEW(entry)); |
| 437 | 437 |
| 438 gtk_box_pack_start(GTK_BOX(vbox), | 438 gtk_box_pack_start(GTK_BOX(vbox), |
| 439 pidgin_make_scrollable(entry, GTK_POLICY_NEVER, GTK_POLICY_ALWAYS, GTK_SHADOW_IN, 320, 130), | 439 pidgin_make_scrollable(entry, GTK_POLICY_NEVER, GTK_POLICY_ALWAYS, GTK_SHADOW_IN, 320, 130), |
| 440 TRUE, TRUE, 0); | 440 TRUE, TRUE, 0); |
| 441 } | 441 } |
| 442 else { | 442 else { |
| 443 entry = gtk_entry_new(); | 443 entry = gtk_entry_new(); |
| 818 } | 818 } |
| 819 break; | 819 break; |
| 820 } | 820 } |
| 821 } | 821 } |
| 822 } | 822 } |
| 823 pidgin_setup_screenname_autocomplete_with_filter(entry, optmenu, pidgin_screenname_autocomplete_default_filter, GINT_TO_POINTER(!strcmp(type_hint, "screenname-all"))); | 823 pidgin_setup_screenname_autocomplete_with_filter(entry, optmenu, pidgin_screenname_autocomplete_default_filter, GINT_TO_POINTER(purple_strequal(type_hint, "screenname-all"))); |
| 824 } | 824 } |
| 825 } | 825 } |
| 826 } | 826 } |
| 827 | 827 |
| 828 static GtkWidget * | 828 static GtkWidget * |
| 1258 | 1258 |
| 1259 if(total_fields > 9) { | 1259 if(total_fields > 9) { |
| 1260 GtkWidget *hbox_for_spacing, *vbox_for_spacing; | 1260 GtkWidget *hbox_for_spacing, *vbox_for_spacing; |
| 1261 | 1261 |
| 1262 hbox_for_spacing = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER); | 1262 hbox_for_spacing = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER); |
| 1263 gtk_box_pack_start(GTK_BOX(vbox), | 1263 gtk_box_pack_start(GTK_BOX(vbox), |
| 1264 pidgin_make_scrollable(hbox_for_spacing, GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC, GTK_SHADOW_NONE, -1, 200), | 1264 pidgin_make_scrollable(hbox_for_spacing, GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC, GTK_SHADOW_NONE, -1, 200), |
| 1265 TRUE, TRUE, 0); | 1265 TRUE, TRUE, 0); |
| 1266 gtk_widget_show(hbox_for_spacing); | 1266 gtk_widget_show(hbox_for_spacing); |
| 1267 | 1267 |
| 1268 vbox_for_spacing = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER); | 1268 vbox_for_spacing = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER); |
| 1269 gtk_box_pack_start(GTK_BOX(hbox_for_spacing), | 1269 gtk_box_pack_start(GTK_BOX(hbox_for_spacing), |
