pidgin/pidgin

Fix the resource path so we can use the automatic stuff that GtkApplication supports

2021-08-16, Gary Kramlich
ec8b76f3bf0a
Parents b867c3e03cb0
Children 2918459dbd63
Fix the resource path so we can use the automatic stuff that GtkApplication supports

Testing Done:
Opened a conversation, as well as the plugins and help dialogs.

Reviewed at https://reviews.imfreedom.org/r/898/
32 files changed, 38 insertions(+), 39 deletions(-)
  • +1 -1
    pidgin/gtkaccount.c
  • +1 -1
    pidgin/gtkconv.c
  • +1 -1
    pidgin/gtkprivacy.c
  • +1 -1
    pidgin/gtkroomlist.c
  • +1 -1
    pidgin/gtkwhiteboard.c
  • +1 -1
    pidgin/gtkxfer.c
  • +3 -3
    pidgin/pidginabout.c
  • +1 -1
    pidgin/pidginaccountactionsmenu.c
  • +1 -1
    pidgin/pidginaccountchooser.c
  • +1 -1
    pidgin/pidginaccountsmenu.c
  • +0 -1
    pidgin/pidginapplication.c
  • +2 -2
    pidgin/pidginavatar.c
  • +1 -1
    pidgin/pidginclosebutton.c
  • +1 -1
    pidgin/pidgincontactlist.c
  • +2 -2
    pidgin/pidginconversationwindow.c
  • +2 -2
    pidgin/pidgindebug.c
  • +1 -1
    pidgin/pidgininfopane.c
  • +1 -1
    pidgin/pidgininvitedialog.c
  • +1 -1
    pidgin/pidginlog.c
  • +1 -1
    pidgin/pidginpluginsdialog.c
  • +1 -1
    pidgin/pidginpluginsmenu.c
  • +1 -1
    pidgin/pidginprotocolchooser.c
  • +1 -1
    pidgin/plugins/disco/gtkdisco.c
  • +1 -1
    pidgin/plugins/disco/resources/xmppdisco.gresource.xml
  • +1 -1
    pidgin/plugins/xmppconsole/xmppconsole.c
  • +1 -1
    pidgin/plugins/xmppconsole/xmppconsole.gresource.xml
  • +1 -1
    pidgin/prefs/pidgincredentialproviderrow.c
  • +1 -1
    pidgin/prefs/pidgincredentialspage.c
  • +3 -3
    pidgin/prefs/pidginprefs.c
  • +1 -1
    pidgin/resources/About/about.ui
  • +1 -1
    pidgin/resources/Debug/plugininfo.ui
  • +1 -1
    pidgin/resources/pidgin.gresource.xml
    • --- a/pidgin/gtkaccount.c Mon Aug 16 03:02:37 2021 -0500
    +++ b/pidgin/gtkaccount.c Mon Aug 16 03:10:08 2021 -0500
    @@ -431,7 +431,7 @@
    GList *l, *l2;
    char *username = NULL;
    GtkCssProvider *entry_css;
    - const gchar *res = "/im/pidgin/Pidgin/Accounts/entry.css";
    + const gchar *res = "/im/pidgin/Pidgin3/Accounts/entry.css";
    entry_css = gtk_css_provider_new();
    gtk_css_provider_load_from_resource(entry_css, res);
    --- a/pidgin/gtkconv.c Mon Aug 16 03:02:37 2021 -0500
    +++ b/pidgin/gtkconv.c Mon Aug 16 03:10:08 2021 -0500
    @@ -5845,7 +5845,7 @@
    set_default_tab_colors(GtkWidget *widget)
    {
    GtkCssProvider *provider = gtk_css_provider_new();
    - const gchar *res = "/im/pidgin/Pidgin/Conversations/tab-label.css";
    + const gchar *res = "/im/pidgin/Pidgin3/Conversations/tab-label.css";
    gtk_css_provider_load_from_resource(provider, res);
    --- a/pidgin/gtkprivacy.c Mon Aug 16 03:02:37 2021 -0500
    +++ b/pidgin/gtkprivacy.c Mon Aug 16 03:10:08 2021 -0500
    @@ -265,7 +265,7 @@
    GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
    gtk_widget_class_set_template_from_resource(
    - widget_class, "/im/pidgin/Pidgin/Privacy/dialog.ui");
    + widget_class, "/im/pidgin/Pidgin3/Privacy/dialog.ui");
    gtk_widget_class_bind_template_child(widget_class, PidginPrivacyDialog,
    account_chooser);
    --- a/pidgin/gtkroomlist.c Mon Aug 16 03:02:37 2021 -0500
    +++ b/pidgin/gtkroomlist.c Mon Aug 16 03:10:08 2021 -0500
    @@ -497,7 +497,7 @@
    GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
    gtk_widget_class_set_template_from_resource(
    - widget_class, "/im/pidgin/Pidgin/Roomlist/roomlist.ui");
    + widget_class, "/im/pidgin/Pidgin3/Roomlist/roomlist.ui");
    gtk_widget_class_bind_template_child(widget_class, PidginRoomlistDialog,
    account_widget);
    --- a/pidgin/gtkwhiteboard.c Mon Aug 16 03:02:37 2021 -0500
    +++ b/pidgin/gtkwhiteboard.c Mon Aug 16 03:10:08 2021 -0500
    @@ -663,7 +663,7 @@
    obj_class->finalize = pidgin_whiteboard_finalize;
    gtk_widget_class_set_template_from_resource(
    - widget_class, "/im/pidgin/Pidgin/Whiteboard/whiteboard.ui");
    + widget_class, "/im/pidgin/Pidgin3/Whiteboard/whiteboard.ui");
    gtk_widget_class_bind_template_child(widget_class, PidginWhiteboard,
    drawing_area);
    --- a/pidgin/gtkxfer.c Mon Aug 16 03:02:37 2021 -0500
    +++ b/pidgin/gtkxfer.c Mon Aug 16 03:10:08 2021 -0500
    @@ -546,7 +546,7 @@
    GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
    gtk_widget_class_set_template_from_resource(
    - widget_class, "/im/pidgin/Pidgin/Xfer/xfer.ui");
    + widget_class, "/im/pidgin/Pidgin3/Xfer/xfer.ui");
    gtk_widget_class_bind_template_callback(widget_class, delete_win_cb);
    --- a/pidgin/pidginabout.c Mon Aug 16 03:02:37 2021 -0500
    +++ b/pidgin/pidginabout.c Mon Aug 16 03:10:08 2021 -0500
    @@ -89,7 +89,7 @@
    /* now load the html */
    istream = g_resource_open_stream(pidgin_get_resource(),
    - "/im/pidgin/Pidgin/About/about.md",
    + "/im/pidgin/Pidgin3/About/about.md",
    G_RESOURCE_LOOKUP_FLAGS_NONE, NULL);
    str = g_string_new("");
    @@ -121,7 +121,7 @@
    /* get a stream to the credits resource */
    istream = g_resource_open_stream(pidgin_get_resource(),
    - "/im/pidgin/Pidgin/About/credits.json",
    + "/im/pidgin/Pidgin3/About/credits.json",
    G_RESOURCE_LOOKUP_FLAGS_NONE, NULL);
    /* create our parser */
    @@ -522,7 +522,7 @@
    gtk_widget_class_set_template_from_resource(
    widget_class,
    - "/im/pidgin/Pidgin/About/about.ui"
    + "/im/pidgin/Pidgin3/About/about.ui"
    );
    gtk_widget_class_bind_template_child(widget_class, PidginAboutDialog, close_button);
    --- a/pidgin/pidginaccountactionsmenu.c Mon Aug 16 03:02:37 2021 -0500
    +++ b/pidgin/pidginaccountactionsmenu.c Mon Aug 16 03:10:08 2021 -0500
    @@ -239,7 +239,7 @@
    gtk_widget_class_set_template_from_resource(
    widget_class,
    - "/im/pidgin/Pidgin/Accounts/actionsmenu.ui"
    + "/im/pidgin/Pidgin3/Accounts/actionsmenu.ui"
    );
    obj_class->get_property = pidgin_account_actions_menu_get_property;
    --- a/pidgin/pidginaccountchooser.c Mon Aug 16 03:02:37 2021 -0500
    +++ b/pidgin/pidginaccountchooser.c Mon Aug 16 03:10:08 2021 -0500
    @@ -105,7 +105,7 @@
    /* Widget template */
    gtk_widget_class_set_template_from_resource(
    - widget_class, "/im/pidgin/Pidgin/Accounts/chooser.ui");
    + widget_class, "/im/pidgin/Pidgin3/Accounts/chooser.ui");
    }
    static void
    --- a/pidgin/pidginaccountsmenu.c Mon Aug 16 03:02:37 2021 -0500
    +++ b/pidgin/pidginaccountsmenu.c Mon Aug 16 03:10:08 2021 -0500
    @@ -238,7 +238,7 @@
    gtk_widget_class_set_template_from_resource(
    widget_class,
    - "/im/pidgin/Pidgin/Accounts/menu.ui"
    + "/im/pidgin/Pidgin3/Accounts/menu.ui"
    );
    gtk_widget_class_bind_template_child(widget_class, PidginAccountsMenu,
    --- a/pidgin/pidginapplication.c Mon Aug 16 03:02:37 2021 -0500
    +++ b/pidgin/pidginapplication.c Mon Aug 16 03:10:08 2021 -0500
    @@ -750,6 +750,5 @@
    "flags", G_APPLICATION_CAN_OVERRIDE_APP_ID |
    G_APPLICATION_HANDLES_COMMAND_LINE,
    "register-session", TRUE,
    - "resource-base-path", "/im/pidgin/Pidgin",
    NULL);
    }
    --- a/pidgin/pidginavatar.c Mon Aug 16 03:02:37 2021 -0500
    +++ b/pidgin/pidginavatar.c Mon Aug 16 03:10:08 2021 -0500
    @@ -307,7 +307,7 @@
    return FALSE;
    }
    - builder = gtk_builder_new_from_resource("/im/pidgin/Pidgin/Avatar/menu.ui");
    + builder = gtk_builder_new_from_resource("/im/pidgin/Pidgin3/Avatar/menu.ui");
    model = (GMenuModel *)gtk_builder_get_object(builder, "menu");
    menu = gtk_menu_new_from_model(model);
    @@ -498,7 +498,7 @@
    gtk_widget_class_set_template_from_resource(
    widget_class,
    - "/im/pidgin/Pidgin/Avatar/avatar.ui"
    + "/im/pidgin/Pidgin3/Avatar/avatar.ui"
    );
    gtk_widget_class_bind_template_child(widget_class, PidginAvatar, icon);
    --- a/pidgin/pidginclosebutton.c Mon Aug 16 03:02:37 2021 -0500
    +++ b/pidgin/pidginclosebutton.c Mon Aug 16 03:10:08 2021 -0500
    @@ -41,7 +41,7 @@
    gtk_widget_class_set_template_from_resource(
    widget_class,
    - "/im/pidgin/Pidgin/closebutton.ui"
    + "/im/pidgin/Pidgin3/closebutton.ui"
    );
    }
    --- a/pidgin/pidgincontactlist.c Mon Aug 16 03:02:37 2021 -0500
    +++ b/pidgin/pidgincontactlist.c Mon Aug 16 03:10:08 2021 -0500
    @@ -75,7 +75,7 @@
    gtk_widget_class_set_template_from_resource(
    widget_class,
    - "/im/pidgin/Pidgin/BuddyList/window.ui"
    + "/im/pidgin/Pidgin3/BuddyList/window.ui"
    );
    gtk_widget_class_bind_template_child(widget_class, PidginContactList, vbox);
    --- a/pidgin/pidginconversationwindow.c Mon Aug 16 03:02:37 2021 -0500
    +++ b/pidgin/pidginconversationwindow.c Mon Aug 16 03:10:08 2021 -0500
    @@ -46,7 +46,7 @@
    GTK_APPLICATION(g_application_get_default()));
    /* setup our menu */
    - builder = gtk_builder_new_from_resource("/im/pidgin/Pidgin/Conversations/menu.ui");
    + builder = gtk_builder_new_from_resource("/im/pidgin/Pidgin3/Conversations/menu.ui");
    model = (GMenuModel *)gtk_builder_get_object(builder, "conversation");
    menubar = gtk_menu_bar_new_from_model(model);
    @@ -62,7 +62,7 @@
    gtk_widget_class_set_template_from_resource(
    widget_class,
    - "/im/pidgin/Pidgin/Conversations/window.ui"
    + "/im/pidgin/Pidgin3/Conversations/window.ui"
    );
    gtk_widget_class_bind_template_child(widget_class, PidginConversationWindow,
    --- a/pidgin/pidgindebug.c Mon Aug 16 03:02:37 2021 -0500
    +++ b/pidgin/pidgindebug.c Mon Aug 16 03:10:08 2021 -0500
    @@ -513,7 +513,7 @@
    gtk_widget_class_set_template_from_resource(
    widget_class,
    - "/im/pidgin/Pidgin/Debug/debug.ui"
    + "/im/pidgin/Pidgin3/Debug/debug.ui"
    );
    gtk_widget_class_bind_template_child(
    @@ -580,7 +580,7 @@
    GtkTextIter end;
    GtkStyleContext *context;
    GtkCssProvider *filter_css;
    - const gchar *res = "/im/pidgin/Pidgin/Debug/filter.css";
    + const gchar *res = "/im/pidgin/Pidgin3/Debug/filter.css";
    gtk_widget_init_template(GTK_WIDGET(win));
    --- a/pidgin/pidgininfopane.c Mon Aug 16 03:02:37 2021 -0500
    +++ b/pidgin/pidgininfopane.c Mon Aug 16 03:10:08 2021 -0500
    @@ -176,7 +176,7 @@
    gtk_widget_class_set_template_from_resource(
    widget_class,
    - "/im/pidgin/Pidgin/Conversations/infopane.ui"
    + "/im/pidgin/Pidgin3/Conversations/infopane.ui"
    );
    gtk_widget_class_bind_template_child(widget_class, PidginInfoPane, hbox);
    --- a/pidgin/pidgininvitedialog.c Mon Aug 16 03:02:37 2021 -0500
    +++ b/pidgin/pidgininvitedialog.c Mon Aug 16 03:10:08 2021 -0500
    @@ -176,7 +176,7 @@
    gtk_widget_class_set_template_from_resource(
    widget_class,
    - "/im/pidgin/Pidgin/Conversations/invite_dialog.ui"
    + "/im/pidgin/Pidgin3/Conversations/invite_dialog.ui"
    );
    gtk_widget_class_bind_template_child_private(
    --- a/pidgin/pidginlog.c Mon Aug 16 03:02:37 2021 -0500
    +++ b/pidgin/pidginlog.c Mon Aug 16 03:10:08 2021 -0500
    @@ -658,7 +658,7 @@
    GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
    gtk_widget_class_set_template_from_resource(
    - widget_class, "/im/pidgin/Pidgin/Log/log-viewer.ui");
    + widget_class, "/im/pidgin/Pidgin3/Log/log-viewer.ui");
    gtk_widget_class_bind_template_child_internal(
    widget_class, PidginLogViewer, browse_button);
    --- a/pidgin/pidginpluginsdialog.c Mon Aug 16 03:02:37 2021 -0500
    +++ b/pidgin/pidginpluginsdialog.c Mon Aug 16 03:10:08 2021 -0500
    @@ -301,7 +301,7 @@
    gtk_widget_class_set_template_from_resource(
    widget_class,
    - "/im/pidgin/Pidgin/Plugins/dialog.ui"
    + "/im/pidgin/Pidgin3/Plugins/dialog.ui"
    );
    gtk_widget_class_bind_template_child(widget_class, PidginPluginsDialog, tree_view);
    --- a/pidgin/pidginpluginsmenu.c Mon Aug 16 03:02:37 2021 -0500
    +++ b/pidgin/pidginpluginsmenu.c Mon Aug 16 03:10:08 2021 -0500
    @@ -271,7 +271,7 @@
    gtk_widget_class_set_template_from_resource(
    widget_class,
    - "/im/pidgin/Pidgin/Plugins/menu.ui"
    + "/im/pidgin/Pidgin3/Plugins/menu.ui"
    );
    gtk_widget_class_bind_template_child(widget_class, PidginPluginsMenu,
    --- a/pidgin/pidginprotocolchooser.c Mon Aug 16 03:02:37 2021 -0500
    +++ b/pidgin/pidginprotocolchooser.c Mon Aug 16 03:10:08 2021 -0500
    @@ -64,7 +64,7 @@
    GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
    gtk_widget_class_set_template_from_resource(widget_class,
    - "/im/pidgin/Pidgin/Protocols/chooser.ui");
    + "/im/pidgin/Pidgin3/Protocols/chooser.ui");
    gtk_widget_class_bind_template_child(widget_class, PidginProtocolChooser,
    model);
    --- a/pidgin/plugins/disco/gtkdisco.c Mon Aug 16 03:02:37 2021 -0500
    +++ b/pidgin/plugins/disco/gtkdisco.c Mon Aug 16 03:10:08 2021 -0500
    @@ -564,7 +564,7 @@
    GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
    gtk_widget_class_set_template_from_resource(
    - widget_class, "/im/pidgin/Pidgin/Plugin/XMPPDisco/disco.ui");
    + widget_class, "/im/pidgin/Pidgin3/Plugin/XMPPDisco/disco.ui");
    gtk_widget_class_bind_template_child(widget_class, PidginDiscoDialog,
    account_chooser);
    --- a/pidgin/plugins/disco/resources/xmppdisco.gresource.xml Mon Aug 16 03:02:37 2021 -0500
    +++ b/pidgin/plugins/disco/resources/xmppdisco.gresource.xml Mon Aug 16 03:10:08 2021 -0500
    @@ -1,6 +1,6 @@
    <?xml version="1.0" encoding="UTF-8"?>
    <gresources>
    - <gresource prefix="/im/pidgin/Pidgin/Plugin/XMPPDisco/">
    + <gresource prefix="/im/pidgin/Pidgin3/Plugin/XMPPDisco/">
    <file compressed="true">disco.ui</file>
    </gresource>
    </gresources>
    --- a/pidgin/plugins/xmppconsole/xmppconsole.c Mon Aug 16 03:02:37 2021 -0500
    +++ b/pidgin/plugins/xmppconsole/xmppconsole.c Mon Aug 16 03:10:08 2021 -0500
    @@ -568,7 +568,7 @@
    console = g_new0(XmppConsole, 1);
    builder = gtk_builder_new_from_resource(
    - "/im/pidgin/Pidgin/Plugin/XMPPConsole/console.ui");
    + "/im/pidgin/Pidgin3/Plugin/XMPPConsole/console.ui");
    gtk_builder_set_translation_domain(builder, GETTEXT_PACKAGE);
    console->window = GTK_WIDGET(
    gtk_builder_get_object(builder, "PidginXmppConsole"));
    --- a/pidgin/plugins/xmppconsole/xmppconsole.gresource.xml Mon Aug 16 03:02:37 2021 -0500
    +++ b/pidgin/plugins/xmppconsole/xmppconsole.gresource.xml Mon Aug 16 03:10:08 2021 -0500
    @@ -1,6 +1,6 @@
    <?xml version="1.0" encoding="UTF-8"?>
    <gresources>
    - <gresource prefix="/im/pidgin/Pidgin/Plugin/XMPPConsole/">
    + <gresource prefix="/im/pidgin/Pidgin3/Plugin/XMPPConsole/">
    <file compressed="true">console.ui</file>
    </gresource>
    </gresources>
    --- a/pidgin/prefs/pidgincredentialproviderrow.c Mon Aug 16 03:02:37 2021 -0500
    +++ b/pidgin/prefs/pidgincredentialproviderrow.c Mon Aug 16 03:10:08 2021 -0500
    @@ -175,7 +175,7 @@
    gtk_widget_class_set_template_from_resource(
    widget_class,
    - "/im/pidgin/Pidgin/Prefs/credentialprovider.ui"
    + "/im/pidgin/Pidgin3/Prefs/credentialprovider.ui"
    );
    gtk_widget_class_bind_template_child(widget_class,
    --- a/pidgin/prefs/pidgincredentialspage.c Mon Aug 16 03:02:37 2021 -0500
    +++ b/pidgin/prefs/pidgincredentialspage.c Mon Aug 16 03:10:08 2021 -0500
    @@ -191,7 +191,7 @@
    gtk_widget_class_set_template_from_resource(
    widget_class,
    - "/im/pidgin/Pidgin/Prefs/credentials.ui"
    + "/im/pidgin/Pidgin3/Prefs/credentials.ui"
    );
    gtk_widget_class_bind_template_child(widget_class, PidginCredentialsPage,
    --- a/pidgin/prefs/pidginprefs.c Mon Aug 16 03:02:37 2021 -0500
    +++ b/pidgin/prefs/pidginprefs.c Mon Aug 16 03:10:08 2021 -0500
    @@ -1717,7 +1717,7 @@
    {
    GtkStyleContext *context;
    GtkCssProvider *ip_css;
    - const gchar *res = "/im/pidgin/Pidgin/Prefs/ip.css";
    + const gchar *res = "/im/pidgin/Pidgin3/Prefs/ip.css";
    gtk_entry_set_text(GTK_ENTRY(win->network.stun_server),
    purple_prefs_get_string("/purple/network/stun_server"));
    @@ -2375,7 +2375,7 @@
    GtkWidget *ret;
    PurpleMediaManager *manager;
    - builder = gtk_builder_new_from_resource("/im/pidgin/Pidgin/Prefs/vv.ui");
    + builder = gtk_builder_new_from_resource("/im/pidgin/Pidgin3/Prefs/vv.ui");
    gtk_builder_set_translation_domain(builder, PACKAGE);
    ret = GTK_WIDGET(gtk_builder_get_object(builder, "vv.page"));
    @@ -2459,7 +2459,7 @@
    gtk_widget_class_set_template_from_resource(
    widget_class,
    - "/im/pidgin/Pidgin/Prefs/prefs.ui"
    + "/im/pidgin/Pidgin3/Prefs/prefs.ui"
    );
    /* Main window */
    --- a/pidgin/resources/About/about.ui Mon Aug 16 03:02:37 2021 -0500
    +++ b/pidgin/resources/About/about.ui Mon Aug 16 03:10:08 2021 -0500
    @@ -117,7 +117,7 @@
    <object class="GtkImage" id="logo">
    <property name="visible">True</property>
    <property name="can-focus">False</property>
    - <property name="resource">/im/pidgin/Pidgin/logo.png</property>
    + <property name="resource">/im/pidgin/Pidgin3/logo.png</property>
    <property name="icon_size">6</property>
    </object>
    </child>
    --- a/pidgin/resources/Debug/plugininfo.ui Mon Aug 16 03:02:37 2021 -0500
    +++ b/pidgin/resources/Debug/plugininfo.ui Mon Aug 16 03:10:08 2021 -0500
    @@ -69,7 +69,7 @@
    <object class="GtkImage" id="logo">
    <property name="visible">True</property>
    <property name="can-focus">False</property>
    - <property name="resource">/im/pidgin/Pidgin/logo.png</property>
    + <property name="resource">/im/pidgin/Pidgin3/logo.png</property>
    </object>
    <packing>
    <property name="expand">False</property>
    --- a/pidgin/resources/pidgin.gresource.xml Mon Aug 16 03:02:37 2021 -0500
    +++ b/pidgin/resources/pidgin.gresource.xml Mon Aug 16 03:10:08 2021 -0500
    @@ -1,6 +1,6 @@
    <?xml version="1.0" encoding="UTF-8"?>
    <gresources>
    - <gresource prefix="/im/pidgin/Pidgin/">
    + <gresource prefix="/im/pidgin/Pidgin3/">
    <file>logo.png</file>
    <file compressed="true">About/about.ui</file>
    <file compressed="true">About/about.md</file>