pidgin/pidgin

Move the PidginPluginsMenu creation into the BuddyListMenu ui file

2020-03-31, Gary Kramlich
3e78021f32b2
Parents eb209c40d91e
Children be51a9f44cea
Move the PidginPluginsMenu creation into the BuddyListMenu ui file
2 files changed, 9 insertions(+), 3 deletions(-)
  • +4 -3
    pidgin/pidginbuddylistmenu.c
  • +5 -0
    pidgin/resources/BuddyList/menu.ui
    • --- a/pidgin/pidginbuddylistmenu.c Tue Mar 31 23:40:57 2020 -0500
    +++ b/pidgin/pidginbuddylistmenu.c Tue Mar 31 23:45:35 2020 -0500
    @@ -22,13 +22,12 @@
    #include "pidginbuddylistmenu.h"
    -#include <pidgin/pidginpluginsmenu.h>
    -
    struct _PidginBuddyListMenu {
    GtkMenuBar parent;
    GtkWidget *sort_buddies;
    GtkWidget *plugins;
    + GtkWidget *plugins_menu;
    };
    /******************************************************************************
    @@ -41,7 +40,7 @@
    gtk_widget_init_template(GTK_WIDGET(menu));
    gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu->plugins),
    - pidgin_plugins_menu_new());
    + menu->plugins_menu);
    }
    static void
    @@ -57,6 +56,8 @@
    sort_buddies);
    gtk_widget_class_bind_template_child(widget_class, PidginBuddyListMenu,
    plugins);
    + gtk_widget_class_bind_template_child(widget_class, PidginBuddyListMenu,
    + plugins_menu);
    }
    /******************************************************************************
    --- a/pidgin/resources/BuddyList/menu.ui Tue Mar 31 23:40:57 2020 -0500
    +++ b/pidgin/resources/BuddyList/menu.ui Tue Mar 31 23:45:35 2020 -0500
    @@ -2,6 +2,7 @@
    <!-- Generated with glade 3.22.2 -->
    <interface>
    <requires lib="gtk+" version="3.20"/>
    + <requires lib="pidgin" version="3.0"/>
    <template class="PidginBuddyListMenu" parent="GtkMenuBar">
    <property name="visible">True</property>
    <property name="can_focus">False</property>
    @@ -368,4 +369,8 @@
    </object>
    </child>
    </template>
    + <object class="PidginPluginsMenu" id="plugins_menu">
    + <property name="visible">True</property>
    + <property name="can_focus">False</property>
    + </object>
    </interface>