• Bug#1103872: Bug#1103871: unblock: vala-panel/24.05-3 (8/10)

    From Mike Gabriel@21:1/5 to Paul Gevers on Sat Apr 26 07:40:01 2025
    [continued from previous message]

    + "model",
    + G_TYPE_MENU_MODEL,
    + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
    + properties[PROP_ACTION_GROUP] =
    + g_param_spec_object("action-group",
    + "action-group",
    + "action-group",
    + G_TYPE_ACTION_GROUP,
    + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
    +
    + g_object_class_install_properties(object_class, LAST_PROP, properties); +}
    +
    +static void dbus_menu_importer_class_init(DBusMenuImporterClass *menu_class) +{
    + GObjectClass *object_class;
    +
    + object_class = G_OBJECT_CLASS(menu_class);
    +
    + object_class->constructed = dbus_menu_importer_constructed;
    + object_class->dispose = dbus_menu_importer_dispose;
    + object_class->finalize = dbus_menu_importer_finalize;
    + object_class->set_property = dbus_menu_importer_set_property;
    + object_class->get_property = dbus_menu_importer_get_property;
    +
    + install_properties(object_class);
    +}
    +
    +static void dbus_menu_importer_init(DBusMenuImporter *menu)
    +{
    + menu->proxy = NULL;
    + menu->all_actions = g_simple_action_group_new();
    + menu->top_model =
    + dbus_menu_model_new(0, NULL, menu->proxy, G_ACTION_GROUP(menu->all_actions));
    + g_signal_connect(menu->top_model,
    + "items-changed",
    + G_CALLBACK(dbus_menu_importer_on_root_model_changed), + menu);
    + menu->cancellable = g_cancellable_new();
    +}
    +
    +DBusMenuImporter *dbus_menu_importer_new(const char *bus_name, const char *object_path)
    +{
    + return g_object_new(dbus_menu_importer_get_type(),
    + "bus-name",
    + bus_name,
    + "object-path",
    + object_path,
    + NULL);
    +}
    diff -Nru -w vala-panel-appmenu-0.7.6+dfsg1/subprojects/appmenu-glib-translator/importer-enums.c.template vala-panel-appmenu-24.05+dfsg/subprojects/appmenu-glib-translator/importer-enums.c.template
    --- vala-panel-appmenu-0.7.6+dfsg1/subprojects/appmenu-glib-translator/importer-enums.c.template 1970-01-01 01:00:00.000000000 +0100
    +++ vala-panel-appmenu-24.05+dfsg/subprojects/appmenu-glib-translator/importer-enums.c.template 2024-05-22 13:16:00.000000000 +0200
    @@ -0,0 +1,88 @@
    +/*** BEGIN file-header ***/
    +#include "importer-enums.h"
    +
    +/*** END file-header ***/
    +
    +/*** BEGIN file-production ***/
    +/* enumerations from "@basename@" */
    +#include "@basename@"
    +
    +/*** END file-production ***/
    +
    +/*** BEGIN value-header ***/
    +GType
    +@enum_name@_get_type (void)
    +{
    + static GType the_type = 0;
    +
    + if (the_type == 0)
    + {
    + static const G@Type@Value values[] = {
    +/*** END value-header ***/
    +
    +/*** BEGIN value-production ***/
    + { @VALUENAME@,
    + "@VALUENAME@",
    + "@valuenick@" },
    +/*** END value-production ***/
    +
    +/*** BEGIN value-tail ***/
    + { 0, NULL, NULL }
    + };
    + the_type = g_@type@_register_static (
    + g_intern_static_string ("@EnumName@"),
    + values);
    + }