comparison: pidgin/gtkutils.c
pidgin/gtkutils.c
- branch
- use-after-free
- changeset 40278
- e3d3676df758
- parent 40197
- 75ffd76260fc
- child 40297
- 082c07053a79
equal
deleted
inserted
replaced
| 40237:905872c9dd7a | 40278:e3d3676df758 |
|---|---|
| 1461 | 1461 |
| 1462 if (callback) | 1462 if (callback) |
| 1463 callback(object, data); | 1463 callback(object, data); |
| 1464 } | 1464 } |
| 1465 | 1465 |
| 1466 GtkWidget * | 1466 static GtkWidget * |
| 1467 pidgin_append_menu_action(GtkWidget *menu, PurpleActionMenu *act, | 1467 do_pidgin_append_menu_action(GtkWidget *menu, PurpleActionMenu *act, |
| 1468 gpointer object) | 1468 gpointer object) |
| 1469 { | 1469 { |
| 1470 GtkWidget *menuitem; | 1470 GtkWidget *menuitem; |
| 1471 GList *list; | 1471 GList *list; |
| 1472 | 1472 |
| 1473 if (act == NULL) { | 1473 if (act == NULL) { |
| 1520 } | 1520 } |
| 1521 | 1521 |
| 1522 for (l = list; l; l = l->next) { | 1522 for (l = list; l; l = l->next) { |
| 1523 PurpleActionMenu *act = (PurpleActionMenu *)l->data; | 1523 PurpleActionMenu *act = (PurpleActionMenu *)l->data; |
| 1524 | 1524 |
| 1525 pidgin_append_menu_action(submenu, act, object); | 1525 do_pidgin_append_menu_action(submenu, act, object); |
| 1526 } | 1526 } |
| 1527 g_list_free(list); | 1527 } |
| 1528 purple_action_menu_set_children(act, NULL); | 1528 return menuitem; |
| 1529 } | 1529 } |
| 1530 | |
| 1531 GtkWidget * | |
| 1532 pidgin_append_menu_action(GtkWidget *menu, PurpleActionMenu *act, | |
| 1533 gpointer object) | |
| 1534 { | |
| 1535 GtkWidget *menuitem = do_pidgin_append_menu_action(menu, act, object); | |
| 1530 purple_action_menu_free(act); | 1536 purple_action_menu_free(act); |
| 1531 return menuitem; | 1537 return menuitem; |
| 1532 } | 1538 } |
| 1533 | 1539 |
| 1534 static gboolean buddyname_completion_match_func(GtkEntryCompletion *completion, | 1540 static gboolean buddyname_completion_match_func(GtkEntryCompletion *completion, |
