[gnome-flashback] display-config: fix build warnings
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-flashback] display-config: fix build warnings
- Date: Fri, 10 Jul 2015 20:47:03 +0000 (UTC)
commit 926ebb76a67c94365459b7113e27710732f0e430
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Fri Jul 10 20:30:56 2015 +0300
display-config: fix build warnings
gnome-flashback/libdisplay-config/edid-parse.c | 3 ++
.../libdisplay-config/flashback-confirm-dialog.c | 10 +++---
.../libdisplay-config/flashback-display-config.c | 19 +++-------
.../libdisplay-config/flashback-monitor-config.c | 19 +++++------
.../libdisplay-config/flashback-monitor-manager.c | 34 ++++++++-----------
5 files changed, 37 insertions(+), 48 deletions(-)
---
diff --git a/gnome-flashback/libdisplay-config/edid-parse.c b/gnome-flashback/libdisplay-config/edid-parse.c
index 52bc51e..4033bc0 100644
--- a/gnome-flashback/libdisplay-config/edid-parse.c
+++ b/gnome-flashback/libdisplay-config/edid-parse.c
@@ -338,6 +338,7 @@ decode_standard_timings (const uchar *edid, MonitorInfo *info)
case 0x01: h = (w / 4) * 3; break;
case 0x02: h = (w / 5) * 4; break;
case 0x03: h = (w / 16) * 9; break;
+ default: break;
}
info->standard[i].width = w;
@@ -407,6 +408,8 @@ decode_display_descriptor (const uchar *desc,
break;
case 0x10:
break;
+ default:
+ break;
}
}
diff --git a/gnome-flashback/libdisplay-config/flashback-confirm-dialog.c
b/gnome-flashback/libdisplay-config/flashback-confirm-dialog.c
index 54b9c99..a366449 100644
--- a/gnome-flashback/libdisplay-config/flashback-confirm-dialog.c
+++ b/gnome-flashback/libdisplay-config/flashback-confirm-dialog.c
@@ -48,15 +48,14 @@ static void
update_text (FlashbackConfirmDialog *dialog)
{
FlashbackConfirmDialogPrivate *priv;
- const gchar *text;
gchar *description;
priv = flashback_confirm_dialog_get_instance_private (dialog);
- text = ngettext ("Settings changes will revert in %d second",
- "Settings changes will revert in %d seconds",
- priv->timeout);
- description = g_strdup_printf (text, priv->timeout);
+ description = g_strdup_printf (ngettext ("Settings changes will revert in %d second",
+ "Settings changes will revert in %d seconds",
+ priv->timeout), priv->timeout);
+
gtk_label_set_text (GTK_LABEL (priv->description), description);
g_free (description);
}
@@ -165,6 +164,7 @@ flashback_confirm_dialog_class_init (FlashbackConfirmDialogClass *dialog_class)
GtkWidgetClass *widget_class;
GtkBindingSet *binding_set;
+ object_class = G_OBJECT_CLASS (dialog_class);
widget_class = GTK_WIDGET_CLASS (dialog_class);
dialog_class->close = flashback_confirm_dialog_close;
diff --git a/gnome-flashback/libdisplay-config/flashback-display-config.c
b/gnome-flashback/libdisplay-config/flashback-display-config.c
index a5f5411..ab0a20c 100644
--- a/gnome-flashback/libdisplay-config/flashback-display-config.c
+++ b/gnome-flashback/libdisplay-config/flashback-display-config.c
@@ -184,19 +184,15 @@ static char *
make_display_name (FlashbackMonitorManager *manager,
MetaOutput *output)
{
+ MetaConnectorType type;
char *inches = NULL;
char *vendor_name = NULL;
char *ret;
- switch (output->connector_type)
- {
- case META_CONNECTOR_TYPE_LVDS:
- case META_CONNECTOR_TYPE_eDP:
- ret = g_strdup (_("Built-in display"));
- goto out;
- default:
- break;
- }
+ type = output->connector_type;
+
+ if (type == META_CONNECTOR_TYPE_eDP || type == META_CONNECTOR_TYPE_LVDS)
+ return g_strdup (_("Built-in display"));
if (output->width_mm > 0 && output->height_mm > 0)
{
@@ -236,7 +232,6 @@ make_display_name (FlashbackMonitorManager *manager,
ret = g_strdup (vendor_name);
}
- out:
g_free (inches);
g_free (vendor_name);
@@ -469,7 +464,7 @@ handle_apply_configuration (MetaDBusDisplayConfig *skeleton,
int y;
int new_screen_width;
int new_screen_height;
- guint transform;
+ gint transform;
guint output_index;
GPtrArray *crtc_infos;
GPtrArray *output_infos;
@@ -990,8 +985,6 @@ flashback_display_config_class_init (FlashbackDisplayConfigClass *config_class)
static void
flashback_display_config_init (FlashbackDisplayConfig *config)
{
- MetaDBusDisplayConfig *display_config;
-
config->skeleton = meta_dbus_display_config_skeleton_new ();
config->manager = flashback_monitor_manager_new (config->skeleton);
config->bus_name = g_bus_own_name (G_BUS_TYPE_SESSION,
diff --git a/gnome-flashback/libdisplay-config/flashback-monitor-config.c
b/gnome-flashback/libdisplay-config/flashback-monitor-config.c
index 14848cb..e1cc171 100644
--- a/gnome-flashback/libdisplay-config/flashback-monitor-config.c
+++ b/gnome-flashback/libdisplay-config/flashback-monitor-config.c
@@ -236,15 +236,14 @@ key_is_laptop (MetaOutputKey *key)
static gboolean
output_is_laptop (MetaOutput *output)
{
- /* FIXME: extend with better heuristics */
- switch (output->connector_type)
- {
- case META_CONNECTOR_TYPE_eDP:
- case META_CONNECTOR_TYPE_LVDS:
- return TRUE;
- default:
- return FALSE;
- }
+ MetaConnectorType type;
+
+ type = output->connector_type;
+
+ if (type == META_CONNECTOR_TYPE_eDP || type == META_CONNECTOR_TYPE_LVDS)
+ return TRUE;
+
+ return FALSE;
}
static gboolean
@@ -489,7 +488,7 @@ crtc_assignment_assign (CrtcAssignment *assign,
}
else
{
- MetaCRTCInfo *info = g_slice_new0 (MetaCRTCInfo);
+ info = g_slice_new0 (MetaCRTCInfo);
info->crtc = crtc;
info->mode = mode;
diff --git a/gnome-flashback/libdisplay-config/flashback-monitor-manager.c
b/gnome-flashback/libdisplay-config/flashback-monitor-manager.c
index bc62c60..cea1d05 100644
--- a/gnome-flashback/libdisplay-config/flashback-monitor-manager.c
+++ b/gnome-flashback/libdisplay-config/flashback-monitor-manager.c
@@ -226,9 +226,10 @@ meta_monitor_transform_to_xrandr (MetaMonitorTransform transform)
return RR_Reflect_X | RR_Rotate_180;
case META_MONITOR_TRANSFORM_FLIPPED_270:
return RR_Reflect_X | RR_Rotate_270;
+ default:
+ g_assert_not_reached ();
+ break;
}
-
- g_assert_not_reached ();
}
static MetaMonitorTransform
@@ -539,6 +540,7 @@ output_get_backlight_limits_xrandr (FlashbackMonitorManagerPrivate *priv,
Atom atom;
xcb_connection_t *xcb_conn;
xcb_randr_query_output_property_reply_t *reply;
+ int32_t *values;
atom = XInternAtom (priv->xdisplay, "Backlight", False);
@@ -559,7 +561,7 @@ output_get_backlight_limits_xrandr (FlashbackMonitorManagerPrivate *priv,
goto out;
}
- int32_t *values = xcb_randr_query_output_property_valid_values (reply);
+ values = xcb_randr_query_output_property_valid_values (reply);
output->backlight_min = values[0];
output->backlight_max = values[1];
@@ -793,14 +795,6 @@ get_xmode_name (XRRModeInfo *xmode)
}
static gboolean
-gdk_rectangle_equal (const GdkRectangle *src1,
- const GdkRectangle *src2)
-{
- return ((src1->x == src2->x) && (src1->y == src2->y) &&
- (src1->width == src2->width) && (src1->height == src2->height));
-}
-
-static gboolean
gdk_rectangle_contains_rect (const GdkRectangle *outer_rect,
const GdkRectangle *inner_rect)
{
@@ -1711,17 +1705,16 @@ flashback_monitor_manager_apply_configuration (FlashbackMonitorManager *manager
if (crtc_info->mode != NULL)
{
MetaMonitorMode *mode;
- XID *outputs;
- unsigned int j, n_outputs;
- int width, height;
+ XID *xids;
+ unsigned int j, n_xids;
Status ok;
mode = crtc_info->mode;
- n_outputs = crtc_info->outputs->len;
- outputs = g_new (XID, n_outputs);
+ n_xids = crtc_info->outputs->len;
+ xids = g_new (XID, n_xids);
- for (j = 0; j < n_outputs; j++)
+ for (j = 0; j < n_xids; j++)
{
MetaOutput *output;
@@ -1730,7 +1723,7 @@ flashback_monitor_manager_apply_configuration (FlashbackMonitorManager *manager
output->is_dirty = TRUE;
output->crtc = crtc;
- outputs[j] = output->winsys_id;
+ xids[j] = output->winsys_id;
}
ok = XRRSetCrtcConfig (priv->xdisplay,
@@ -1740,7 +1733,7 @@ flashback_monitor_manager_apply_configuration (FlashbackMonitorManager *manager
crtc_info->x, crtc_info->y,
(XID) mode->mode_id,
meta_monitor_transform_to_xrandr (crtc_info->transform),
- outputs, n_outputs);
+ xids, n_xids);
if (ok != Success)
{
@@ -1770,7 +1763,7 @@ flashback_monitor_manager_apply_configuration (FlashbackMonitorManager *manager
crtc->transform = crtc_info->transform;
next:
- g_free (outputs);
+ g_free (xids);
}
}
@@ -1921,6 +1914,7 @@ flashback_monitor_manager_set_power_save_mode (FlashbackMonitorManager *manager,
case META_POWER_SAVE_OFF:
state = DPMSModeOff;
break;
+ case META_POWER_SAVE_UNSUPPORTED:
default:
return;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]