Mercurial > pidgin.yaz
comparison pidgin/gtkutils.c @ 24838:0d7c21b5f1d7
propagate from branch 'im.pidgin.pidgin' (head c06356e8e8d2c586f0192a5564053c2584020da8)
to branch 'im.pidgin.pidgin.openq' (head a7077bc12b850d60ea7d768f4b9d4ee6ae6ad2c1)
author | SHiNE CsyFeK <csyfek@gmail.com> |
---|---|
date | Thu, 25 Dec 2008 14:06:10 +0000 |
parents | 5ec72dbdd28e |
children | ca01403251f1 a959b17ffc57 |
comparison
equal
deleted
inserted
replaced
24606:68eba2bafa6f | 24838:0d7c21b5f1d7 |
---|---|
1500 gtk_imhtml_insert_image_at_iter(GTK_IMHTML(gtkconv->entry), id, &iter); | 1500 gtk_imhtml_insert_image_at_iter(GTK_IMHTML(gtkconv->entry), id, &iter); |
1501 purple_imgstore_unref_by_id(id); | 1501 purple_imgstore_unref_by_id(id); |
1502 | 1502 |
1503 break; | 1503 break; |
1504 } | 1504 } |
1505 free(data->filename); | 1505 g_free(data->filename); |
1506 free(data->who); | 1506 g_free(data->who); |
1507 free(data); | 1507 g_free(data); |
1508 } | 1508 } |
1509 | 1509 |
1510 static void dnd_image_cancel_callback(_DndData *data, int choice) | 1510 static void dnd_image_cancel_callback(_DndData *data, int choice) |
1511 { | 1511 { |
1512 free(data->filename); | 1512 g_free(data->filename); |
1513 free(data->who); | 1513 g_free(data->who); |
1514 free(data); | 1514 g_free(data); |
1515 } | 1515 } |
1516 | 1516 |
1517 static void dnd_set_icon_ok_cb(_DndData *data) | 1517 static void dnd_set_icon_ok_cb(_DndData *data) |
1518 { | 1518 { |
1519 dnd_image_ok_callback(data, DND_BUDDY_ICON); | 1519 dnd_image_ok_callback(data, DND_BUDDY_ICON); |
1520 } | 1520 } |
1521 | 1521 |
1522 static void dnd_set_icon_cancel_cb(_DndData *data) | 1522 static void dnd_set_icon_cancel_cb(_DndData *data) |
1523 { | 1523 { |
1524 free(data->filename); | 1524 g_free(data->filename); |
1525 free(data->who); | 1525 g_free(data->who); |
1526 free(data); | 1526 g_free(data); |
1527 } | 1527 } |
1528 | 1528 |
1529 void | 1529 void |
1530 pidgin_dnd_file_manage(GtkSelectionData *sd, PurpleAccount *account, const char *who) | 1530 pidgin_dnd_file_manage(GtkSelectionData *sd, PurpleAccount *account, const char *who) |
1531 { | 1531 { |
3274 #endif | 3274 #endif |
3275 | 3275 |
3276 static void | 3276 static void |
3277 combo_box_changed_cb(GtkComboBox *combo_box, GtkEntry *entry) | 3277 combo_box_changed_cb(GtkComboBox *combo_box, GtkEntry *entry) |
3278 { | 3278 { |
3279 #if GTK_CHECK_VERSION(2, 6, 0) | |
3280 char *text = gtk_combo_box_get_active_text(combo_box); | 3279 char *text = gtk_combo_box_get_active_text(combo_box); |
3281 #else | |
3282 GtkWidget *widget = gtk_bin_get_child(GTK_BIN(combo_box)); | |
3283 char *text = g_strdup(gtk_entry_get_text(GTK_ENTRY(widget))); | |
3284 #endif | |
3285 | |
3286 gtk_entry_set_text(entry, text ? text : ""); | 3280 gtk_entry_set_text(entry, text ? text : ""); |
3287 g_free(text); | 3281 g_free(text); |
3288 } | 3282 } |
3289 | 3283 |
3290 static gboolean | 3284 static gboolean |