← Back to branch summary

~xavi-garcia-mena/upower/percentages-power-off

« back to all changes in this revision

Viewing changes to .pc/always_use_pm-utils_backend.patch/src/linux/up-backend.c

  • Committer: Package Import Robot
  • Author(s): Martin Pitt
  • Date: 2013-10-20 17:11:30 UTC
  • mfrom: (49.1.2 sid)
  • Revision ID: package-import@ubuntu.com-20131020171130-flrh6n1po62b1130
Tags: 0.9.23-1
http://bugs.debian.org/722612
* New upstream bug fix release.
* Force libglib2.0-0 to be at least 2.36 to avoid running against earlier
  glib versions which still required g_type_init(). (Closes: #722612)

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/always_use_pm-utils_backend.patch/src/linux/up-backend.c
137
137
 
138
138
        } else if (g_strcmp0 (subsys, "tty") == 0) {
139
139
 
140
 
                /* try to detect a Watts Up? Pro monitor */
141
 
                ret = up_config_get_boolean (backend->priv->config,
142
 
                                             "EnableWattsUpPro");
143
 
                if (ret) {
144
 
                        device = UP_DEVICE (up_device_wup_new ());
145
 
                        ret = up_device_coldplug (device, backend->priv->daemon, G_OBJECT (native));
146
 
                        if (ret)
147
 
                                goto out;
148
 
                        g_object_unref (device);
149
 
                }
 
140
                /* see if this is a Watts Up Pro device */
 
141
                device = UP_DEVICE (up_device_wup_new ());
 
142
                ret = up_device_coldplug (device, backend->priv->daemon, G_OBJECT (native));
 
143
                if (ret)
 
144
                        goto out;
 
145
                g_object_unref (device);
150
146
 
151
147
                /* no valid TTY object */
152
148
                device = NULL;
335
331
        GList *l;
336
332
        guint i;
337
333
        gboolean ret;
338
 
        const gchar *subsystems[] = {"power_supply", "usb", "usbmisc", "tty", "input", "hid", NULL};
 
334
        const gchar *subsystems_wup[] = {"power_supply", "usb", "usbmisc", "tty", "input", "hid", NULL};
 
335
        const gchar *subsystems[] = {"power_supply", "usb", "usbmisc", "input", "hid", NULL};
339
336
 
340
337
        backend->priv->daemon = g_object_ref (daemon);
341
338
        backend->priv->device_list = up_daemon_get_device_list (daemon);
342
 
        backend->priv->gudev_client = g_udev_client_new (subsystems);
 
339
        if (up_config_get_boolean (backend->priv->config, "EnableWattsUpPro"))
 
340
                backend->priv->gudev_client = g_udev_client_new (subsystems_wup);
 
341
        else
 
342
                backend->priv->gudev_client = g_udev_client_new (subsystems);
343
343
        g_signal_connect (backend->priv->gudev_client, "uevent",
344
344
                          G_CALLBACK (up_backend_uevent_signal_handler_cb), backend);
345
345
 
745
745
UpBackend *
746
746
up_backend_new (void)
747
747
{
748
 
        UpBackend *backend;
749
 
        backend = g_object_new (UP_TYPE_BACKEND, NULL);
750
 
        return UP_BACKEND (backend);
 
748
        return g_object_new (UP_TYPE_BACKEND, NULL);
751
749
}
752
750