diff --git a/src/gpm-idle.c b/src/gpm-idle.c index 33d251c..63db354 100644 --- a/src/gpm-idle.c +++ b/src/gpm-idle.c @@ -54,7 +54,6 @@ struct GpmIdlePrivate { - GtkStatusIcon *status_icon; EggIdletime *idletime; GpmLoad *load; GpmSession *session; @@ -96,38 +95,14 @@ gpm_idle_mode_to_text (GpmIdleMode mode) } /** - * gpm_idle_mode_to_icon_name: - **/ -static const gchar * -gpm_idle_mode_to_icon_name (GpmIdleMode mode) -{ - if (mode == GPM_IDLE_MODE_BLANK) - return "view-fullscreen"; - if (mode == GPM_IDLE_MODE_SLEEP) - return "system-log-out"; - return NULL; -} - -/** * gpm_idle_set_mode: * @mode: The new mode, e.g. GPM_IDLE_MODE_SLEEP **/ static void gpm_idle_set_mode (GpmIdle *idle, GpmIdleMode mode) { - const gchar *icon_name; - g_return_if_fail (GPM_IS_IDLE (idle)); - /* debug */ - icon_name = gpm_idle_mode_to_icon_name (mode); - if (icon_name != NULL) { - gtk_status_icon_set_from_icon_name (idle->priv->status_icon, icon_name); - gtk_status_icon_set_visible (idle->priv->status_icon, TRUE); - } else { - gtk_status_icon_set_visible (idle->priv->status_icon, FALSE); - } - if (mode != idle->priv->mode) { idle->priv->mode = mode; egg_debug ("Doing a state transition: %s", gpm_idle_mode_to_text (mode)); @@ -233,7 +208,6 @@ gpm_idle_evaluate (GpmIdle *idle) /* TRANSLATORS: is the screen idle or awake */ idle->priv->x_idle ? _("screen idle") : _("screen awake"), nag_message); - gtk_status_icon_set_tooltip_text (idle->priv->status_icon, tooltip); g_free (tooltip); /* check we are really idle */ @@ -429,9 +403,6 @@ gpm_idle_finalize (GObject *object) if (idle->priv->timeout_sleep_id != 0) g_source_remove (idle->priv->timeout_sleep_id); - /* for debugging */ - g_object_unref (idle->priv->status_icon); - g_object_unref (idle->priv->load); g_object_unref (idle->priv->session); @@ -490,9 +461,6 @@ gpm_idle_init (GpmIdle *idle) g_signal_connect (idle->priv->idletime, "reset", G_CALLBACK (gpm_idle_idletime_reset_cb), idle); g_signal_connect (idle->priv->idletime, "alarm-expired", G_CALLBACK (gpm_idle_idletime_alarm_expired_cb), idle); - /* only used for debugging */ - idle->priv->status_icon = gtk_status_icon_new (); - gpm_idle_evaluate (idle); }