pidgin/pidgin

6e95a22ee02f
Parents 5ba96262ca35
Children bbeb2e98ea5b
Inline pidgin_menu_item_new in XMPP Service Discovery plugin.

Because `NULL` is passed to almost everything, this function saves like a line.

Testing Done:
Compiled, right-clicked on Service Discovery list.

Reviewed at https://reviews.imfreedom.org/r/743/
--- a/pidgin/plugins/disco/gtkdisco.c Thu Jun 10 21:22:48 2021 -0500
+++ b/pidgin/plugins/disco/gtkdisco.c Thu Jun 10 21:23:12 2021 -0500
@@ -265,6 +265,7 @@
PidginDiscoDialog *dialog = user_data;
XmppDiscoService *service;
GtkWidget *menu;
+ GtkWidget *menuitem = NULL;
GtkTreePath *path;
GtkTreeIter iter;
@@ -290,15 +291,17 @@
menu = gtk_menu_new();
if (service->flags & XMPP_DISCO_ADD) {
- pidgin_new_menu_item(menu, _("Add to Buddy List"), NULL,
- G_CALLBACK(add_to_blist_cb), dialog);
+ menuitem = gtk_menu_item_new_with_label(_("Add to Buddy List"));
+ g_signal_connect(G_OBJECT(menuitem), "activate",
+ G_CALLBACK(add_to_blist_cb), dialog);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
}
if (service->flags & XMPP_DISCO_REGISTER) {
- GtkWidget *item = pidgin_new_menu_item(menu, _("Register"),
- NULL, NULL, NULL);
- g_signal_connect(G_OBJECT(item), "activate",
+ menuitem = gtk_menu_item_new_with_label(_("Register"));
+ g_signal_connect(G_OBJECT(menuitem), "activate",
G_CALLBACK(register_button_cb), dialog);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
}
gtk_widget_show_all(menu);