pidgin/pidgin

Drop icons from Room List popup menu.

2021-06-10, Elliott Sales de Andrade
5ba96262ca35
Parents ff8ec7c55f5f
Children 6e95a22ee02f
Drop icons from Room List popup menu.

This allows inlining the contents of `pidgin_new_menu_item`, and then fixes the warning about Stock icons.

Testing Done:
Compiled, saw no warnings, and checked right-click on the dialog.

Reviewed at https://reviews.imfreedom.org/r/742/
1 files changed, 11 insertions(+), 4 deletions(-)
  • +11 -4
    pidgin/gtkroomlist.c
    • --- a/pidgin/gtkroomlist.c Thu Jun 10 21:21:48 2021 -0500
    +++ b/pidgin/gtkroomlist.c Thu Jun 10 21:22:48 2021 -0500
    @@ -302,6 +302,7 @@
    PurpleRoomlistRoom *room;
    GtkTreeIter iter;
    GtkWidget *menu;
    + GtkWidget *menuitem;
    static struct _menu_cb_info info; /* XXX? */
    if (!gdk_event_triggers_context_menu((GdkEvent *)event))
    @@ -325,10 +326,16 @@
    info.room = room;
    menu = gtk_menu_new();
    - pidgin_new_menu_item(menu, _("_Join"), PIDGIN_STOCK_CHAT,
    - G_CALLBACK(do_join_cb), &info);
    - pidgin_new_menu_item(menu, _("_Add"), GTK_STOCK_ADD,
    - G_CALLBACK(do_add_room_cb), &info);
    +
    + menuitem = gtk_menu_item_new_with_mnemonic(_("_Join"));
    + g_signal_connect(G_OBJECT(menuitem), "activate",
    + G_CALLBACK(do_join_cb), &info);
    + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
    +
    + menuitem = gtk_menu_item_new_with_mnemonic(_("_Add"));
    + g_signal_connect(G_OBJECT(menuitem), "activate",
    + G_CALLBACK(do_add_room_cb), &info);
    + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
    gtk_widget_show_all(menu);
    gtk_menu_popup_at_pointer(GTK_MENU(menu), (GdkEvent *)event);