applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

--amend

Browse source
This commit is contained in:
Richard Hughes 2010-11-18 19:41:44 +00:00
parent 0ce60e84cb
commit 06a5844bab
1 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
panels/power/cc-power-panel.c
View file

@ -185,7 +185,6 @@ get_primary_device_cb (GObject *source_object, GAsyncResult *res, gpointer user_
{ {
const gchar *title = NULL; const gchar *title = NULL;
gchar *details = NULL; gchar *details = NULL;
gchar *display_string = NULL;
gchar *icon_name = NULL; gchar *icon_name = NULL;
gchar *object_path = NULL; gchar *object_path = NULL;
gdouble percentage; gdouble percentage;
@ -196,6 +195,7 @@ get_primary_device_cb (GObject *source_object, GAsyncResult *res, gpointer user_
GVariant *result; GVariant *result;
UpDeviceKind kind; UpDeviceKind kind;
UpDeviceState state; UpDeviceState state;
GIcon *icon;
CcPowerPanelPrivate *priv = CC_POWER_PANEL (user_data)->priv; CcPowerPanelPrivate *priv = CC_POWER_PANEL (user_data)->priv;
result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), res, &error); result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), res, &error);
@ -214,8 +214,7 @@ get_primary_device_cb (GObject *source_object, GAsyncResult *res, gpointer user_
"((susdut))", "((susdut))",
&object_path, &object_path,
&kind, &kind,
//&icon_name, &icon_name,
&display_string,
&percentage, &percentage,
&state, &state,
&time); &time);
@ -225,9 +224,20 @@ get_primary_device_cb (GObject *source_object, GAsyncResult *res, gpointer user_
/* set icon and text parameters */ /* set icon and text parameters */
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
"image_status")); "image_status"));
gtk_image_set_from_icon_name (GTK_IMAGE (widget), icon = g_icon_new_for_string (icon_name, NULL);
icon_name != NULL ? icon_name : "dialog-error", if (icon != NULL)
{
gtk_image_set_from_gicon (GTK_IMAGE (widget),
icon,
GTK_ICON_SIZE_DIALOG); GTK_ICON_SIZE_DIALOG);
g_object_unref (icon);
}
else
{
gtk_image_set_from_icon_name (GTK_IMAGE (widget),
"dialog-error",
GTK_ICON_SIZE_DIALOG);
}
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
"label_title")); "label_title"));
@ -296,7 +306,6 @@ get_primary_device_cb (GObject *source_object, GAsyncResult *res, gpointer user_
details); details);
g_free (details); g_free (details);
g_free (display_string);
g_free (time_string); g_free (time_string);
g_free (object_path); g_free (object_path);
g_free (icon_name); g_free (icon_name);