Skip to content

[Next] power: drop Phone Manager #430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
okaestne wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Next] power: drop Phone Manager #430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 0 additions & 102 deletions plugins/power/csd-power-manager.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
#include <libcinnamon-desktop/gnome-rr.h>

#include "gpm-common.h"
#include "gpm-phone.h"
#include "gpm-idletime.h"
#include "cinnamon-settings-profile.h"
#include "cinnamon-settings-session.h"
Expand Down Expand Up @@ -156,7 +155,6 @@ struct CsdPowerManagerPrivate
GnomeRRScreen *x11_screen;
gboolean use_time_primary;
GIcon *previous_icon;
GpmPhone *phone;
GPtrArray *devices_array;
guint action_percentage;
guint action_time;
Expand Down Expand Up @@ -913,9 +911,6 @@ engine_coldplug (CsdPowerManager *manager)
GPtrArray *array = NULL;
UpDevice *device;

/* connected mobile phones */
gpm_phone_coldplug (manager->priv->phone);

engine_recalculate_state (manager);

/* add to database */
Expand Down Expand Up @@ -1705,90 +1700,6 @@ engine_get_primary_device (CsdPowerManager *manager)
return device;
}

static void
phone_device_added_cb (GpmPhone *phone, guint idx, CsdPowerManager *manager)
{
UpDevice *device;
device = up_device_new ();

g_debug ("phone added %i", idx);

/* get device properties */
g_object_set (device,
"kind", UP_DEVICE_KIND_PHONE,
"is-rechargeable", TRUE,
"native-path", g_strdup_printf ("dummy:phone_%i", idx),
"is-present", TRUE,
NULL);

/* state changed */
engine_device_add (manager, device);
g_ptr_array_add (manager->priv->devices_array, g_object_ref (device));
engine_recalculate_state (manager);
}

static void
phone_device_removed_cb (GpmPhone *phone, guint idx, CsdPowerManager *manager)
{
guint i;
UpDevice *device;
UpDeviceKind kind;

g_debug ("phone removed %i", idx);

for (i=0; i<manager->priv->devices_array->len; i++) {
device = g_ptr_array_index (manager->priv->devices_array, i);

/* get device properties */
g_object_get (device,
"kind", &kind,
NULL);

if (kind == UP_DEVICE_KIND_PHONE) {
g_ptr_array_remove_index (manager->priv->devices_array, i);
break;
}
}

/* state changed */
engine_recalculate_state (manager);
}

static void
phone_device_refresh_cb (GpmPhone *phone, guint idx, CsdPowerManager *manager)
{
guint i;
UpDevice *device;
UpDeviceKind kind;
UpDeviceState state;
gboolean is_present;
gdouble percentage;

g_debug ("phone refresh %i", idx);

for (i=0; i<manager->priv->devices_array->len; i++) {
device = g_ptr_array_index (manager->priv->devices_array, i);

/* get device properties */
g_object_get (device,
"kind", &kind,
"state", &state,
"percentage", &percentage,
"is-present", &is_present,
NULL);

if (kind == UP_DEVICE_KIND_PHONE) {
is_present = gpm_phone_get_present (phone, idx);
state = gpm_phone_get_on_ac (phone, idx) ? UP_DEVICE_STATE_CHARGING : UP_DEVICE_STATE_DISCHARGING;
percentage = gpm_phone_get_percentage (phone, idx);
break;
}
}

/* state changed */
engine_recalculate_state (manager);
}

static void
cinnamon_session_shutdown_cb (GObject *source_object,
GAsyncResult *res,
Expand Down Expand Up @@ -4094,14 +4005,6 @@ on_rr_screen_acquired (GObject *object,
connect_screen_iface (manager);
connect_keyboard_iface (manager);

manager->priv->phone = gpm_phone_new ();
g_signal_connect (manager->priv->phone, "device-added",
G_CALLBACK (phone_device_added_cb), manager);
g_signal_connect (manager->priv->phone, "device-removed",
G_CALLBACK (phone_device_removed_cb), manager);
g_signal_connect (manager->priv->phone, "device-refresh",
G_CALLBACK (phone_device_refresh_cb), manager);

/* create a fake virtual composite battery */
manager->priv->device_composite = up_device_new ();
g_object_set (manager->priv->device_composite,
Expand Down Expand Up @@ -4295,11 +4198,6 @@ csd_power_manager_stop (CsdPowerManager *manager)
g_ptr_array_unref (manager->priv->devices_array);
manager->priv->devices_array = NULL;

if (manager->priv->phone != NULL) {
g_object_unref (manager->priv->phone);
manager->priv->phone = NULL;
}

if (manager->priv->device_composite != NULL) {
g_object_unref (manager->priv->device_composite);
manager->priv->device_composite = NULL;
Expand Down
Loading
Loading