pidgin/pidgin

Explicitly set show-menubar so our menubars are shown
gtk4
21 months ago, Gary Kramlich
4ee4a8ddc190
Parents 732b1fcb8e31
Children 853b74b4a222
Explicitly set show-menubar so our menubars are shown

Testing Done:
Ran and verified the menus are displayed. Shortcut keys aren't working either so that might be part of the issue why they're not showing up with the ui file being set?

Reviewed at https://reviews.imfreedom.org/r/1635/
5 files changed, 11 insertions(+), 3 deletions(-)
  • +4 -1
    pidgin/pidgincontactlistwindow.c
  • +4 -1
    pidgin/pidginconversationwindow.c
  • +1 -0
    pidgin/resources/BuddyList/window.ui
  • +1 -0
    pidgin/resources/Conversations/window.ui
  • +1 -1
    pidgin/resources/gtk/menus.ui
    • --- a/pidgin/pidgincontactlistwindow.c Tue Aug 23 04:28:29 2022 -0500
    +++ b/pidgin/pidgincontactlistwindow.c Tue Aug 23 04:29:09 2022 -0500
    @@ -68,7 +68,10 @@
    *****************************************************************************/
    GtkWidget *
    pidgin_contact_list_window_new(void) {
    - return g_object_new(PIDGIN_TYPE_CONTACT_LIST_WINDOW, NULL);
    + return g_object_new(
    + PIDGIN_TYPE_CONTACT_LIST_WINDOW,
    + "show-menubar", TRUE,
    + NULL);
    }
    GtkWidget *
    --- a/pidgin/pidginconversationwindow.c Tue Aug 23 04:28:29 2022 -0500
    +++ b/pidgin/pidginconversationwindow.c Tue Aug 23 04:29:09 2022 -0500
    @@ -530,7 +530,10 @@
    GtkWidget *
    pidgin_conversation_window_new(void) {
    - return GTK_WIDGET(g_object_new(PIDGIN_TYPE_CONVERSATION_WINDOW, NULL));
    + return g_object_new(
    + PIDGIN_TYPE_CONVERSATION_WINDOW,
    + "show-menubar", TRUE,
    + NULL);
    }
    void
    --- a/pidgin/resources/BuddyList/window.ui Tue Aug 23 04:28:29 2022 -0500
    +++ b/pidgin/resources/BuddyList/window.ui Tue Aug 23 04:29:09 2022 -0500
    @@ -28,6 +28,7 @@
    <!-- interface-copyright Pidgin Developers <devel@pidgin.im> -->
    <template class="PidginContactListWindow" parent="GtkApplicationWindow">
    <property name="title" translatable="1">Contact List</property>
    + <property name="show-menubar">1</property>
    <child>
    <object class="GtkBox" id="vbox">
    <property name="orientation">vertical</property>
    --- a/pidgin/resources/Conversations/window.ui Tue Aug 23 04:28:29 2022 -0500
    +++ b/pidgin/resources/Conversations/window.ui Tue Aug 23 04:29:09 2022 -0500
    @@ -37,6 +37,7 @@
    </columns>
    </object>
    <template class="PidginConversationWindow" parent="GtkApplicationWindow">
    + <property name="show-menubar">1</property>
    <child>
    <object class="GtkEventControllerKey">
    <property name="propagation-phase">capture</property>
    --- a/pidgin/resources/gtk/menus.ui Tue Aug 23 04:28:29 2022 -0500
    +++ b/pidgin/resources/gtk/menus.ui Tue Aug 23 04:29:09 2022 -0500
    @@ -18,7 +18,7 @@
    along with this program; if not, see <https://www.gnu.org/licenses/>.
    -->
    <interface>
    - <requires lib="gtk+" version="3.22"/>
    + <requires lib="gtk" version="4.0"/>
    <!-- interface-license-type gplv2 -->
    <!-- interface-name Pidgin -->
    <!-- interface-description Internet Messenger -->