pidgin/gtkrequest.c

changeset 40329
b5e0f65a5d9c
parent 40326
cdca03a74387
child 40333
c38a56bd5536
equal deleted inserted replaced
40328:45e719e8d3bc 40329:b5e0f65a5d9c
1236 widget = gtk_combo_box_text_new(); 1236 widget = gtk_combo_box_text_new();
1237 1237
1238 i = 0; 1238 i = 0;
1239 for (GList *l = elements; l != NULL; l = g_list_next(l)) 1239 for (GList *l = elements; l != NULL; l = g_list_next(l))
1240 { 1240 {
1241 PurpleNamedValue *choice = l->data; 1241 PurpleKeyValuePair *choice = l->data;
1242 1242
1243 gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(widget), choice->name); 1243 gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(widget), choice->key);
1244 if (choice->value == default_value) { 1244 if (choice->value == default_value) {
1245 default_index = i; 1245 default_index = i;
1246 default_found = TRUE; 1246 default_found = TRUE;
1247 } 1247 }
1248 values[i++] = choice->value; 1248 values[i++] = choice->value;
1271 gtk_widget_set_tooltip_text(widget, purple_request_field_get_tooltip(field)); 1271 gtk_widget_set_tooltip_text(widget, purple_request_field_get_tooltip(field));
1272 1272
1273 i = 0; 1273 i = 0;
1274 for (GList *l = elements; l != NULL; l = g_list_next(l)) 1274 for (GList *l = elements; l != NULL; l = g_list_next(l))
1275 { 1275 {
1276 PurpleNamedValue *choice = l->data; 1276 PurpleKeyValuePair *choice = l->data;
1277 1277
1278 radio = gtk_radio_button_new_with_label_from_widget( 1278 radio = gtk_radio_button_new_with_label_from_widget(
1279 GTK_RADIO_BUTTON(first_radio), choice->name); 1279 GTK_RADIO_BUTTON(first_radio), choice->key);
1280 g_object_set_data(G_OBJECT(radio), "box", box); 1280 g_object_set_data(G_OBJECT(radio), "box", box);
1281 1281
1282 if (first_radio == NULL) 1282 if (first_radio == NULL)
1283 first_radio = radio; 1283 first_radio = radio;
1284 1284
1917 gtk_widget_show(img); 1917 gtk_widget_show(img);
1918 1918
1919 pidgin_request_add_help(GTK_DIALOG(win), cpar); 1919 pidgin_request_add_help(GTK_DIALOG(win), cpar);
1920 1920
1921 for (GSList *it = extra_actions; it != NULL; it = it->next) { 1921 for (GSList *it = extra_actions; it != NULL; it = it->next) {
1922 PurpleNamedValue *extra_action = it->data; 1922 PurpleKeyValuePair *extra_action = it->data;
1923 1923
1924 button = pidgin_dialog_add_button(GTK_DIALOG(win), extra_action->name, 1924 button = pidgin_dialog_add_button(GTK_DIALOG(win), extra_action->key,
1925 G_CALLBACK(multifield_extra_cb), data); 1925 G_CALLBACK(multifield_extra_cb), data);
1926 g_object_set_data(G_OBJECT(button), "extra-cb", extra_action->value); 1926 g_object_set_data(G_OBJECT(button), "extra-cb", extra_action->value);
1927 } 1927 }
1928 1928
1929 /* Cancel button */ 1929 /* Cancel button */

mercurial