Drop unused edid.h, xfce-rr-config.{c,h}, xfce-rr-output-info.c

src/edid.h

-/* edid.h
- *
- * Copyright 2007, 2008, Red Hat, Inc.
- *
- * This file is part of the Mate Library.
- *
- * The Mate Library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * The Mate Library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with the Mate Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- * Author: Soren Sandmann <sandmann@redhat.com>
- */
-
-#ifndef EDID_H
-#define EDID_H
-
-typedef unsigned char uchar;
-typedef struct MonitorInfo MonitorInfo;
-typedef struct Timing Timing;
-typedef struct DetailedTiming DetailedTiming;
-
-typedef enum {
-	UNDEFINED,
-	DVI,
-	HDMI_A,
-	HDMI_B,
-	MDDI,
-	DISPLAY_PORT
-} Interface;
-
-typedef enum {
-	UNDEFINED_COLOR,
-	MONOCHROME,
-	RGB,
-	OTHER_COLOR
-} ColorType;
-
-typedef enum {
-	NO_STEREO,
-	FIELD_RIGHT,
-	FIELD_LEFT,
-	TWO_WAY_RIGHT_ON_EVEN,
-	TWO_WAY_LEFT_ON_EVEN,
-	FOUR_WAY_INTERLEAVED,
-	SIDE_BY_SIDE
-} StereoType;
-
-struct Timing {
-	int width;
-	int height;
-	int frequency;
-};
-
-struct DetailedTiming {
-	int pixel_clock;
-	int h_addr;
-	int h_blank;
-	int h_sync;
-    int h_front_porch;
-	int v_addr;
-	int v_blank;
-	int v_sync;
-	int v_front_porch;
-	int width_mm;
-	int height_mm;
-	int right_border;
-	int top_border;
-	int interlaced;
-	StereoType stereo;
-
-	int digital_sync;
-
-	union {
-		struct {
-			int bipolar;
-			int serrations;
-			int sync_on_green;
-		} analog;
-
-		struct {
-			int composite;
-			int serrations;
-			int negative_vsync;
-			int negative_hsync;
-		} digital;
-	} connector;
-};
-
-struct MonitorInfo {
-	int checksum;
-	char manufacturer_code[4];
-	int product_code;
-	unsigned int serial_number;
-
-	int production_week;	/* -1 if not specified */
-	int production_year;	/* -1 if not specified */
-	int model_year;		/* -1 if not specified */
-
-	int major_version;
-	int minor_version;
-
-	int is_digital;
-
-	union {
-		struct {
-			int bits_per_primary;
-			Interface interface;
-			int rgb444;
-			int ycrcb444;
-			int ycrcb422;
-		} digital;
-
-		struct {
-			double video_signal_level;
-			double sync_signal_level;
-			double total_signal_level;
-
-			int blank_to_black;
-
-			int separate_hv_sync;
-			int composite_sync_on_h;
-			int composite_sync_on_green;
-			int serration_on_vsync;
-			ColorType color_type;
-		} analog;
-	} connector;
-
-	int width_mm;		/* -1 if not specified */
-	int height_mm;		/* -1 if not specified */
-	double aspect_ratio;		/* -1.0 if not specififed */
-
-	double gamma;			/* -1.0 if not specified */
-
-	int standby;
-	int suspend;
-	int active_off;
-
-	int srgb_is_standard;
-	int preferred_timing_includes_native;
-	int continuous_frequency;
-
-	double red_x;
-	double red_y;
-	double green_x;
-	double green_y;
-	double blue_x;
-	double blue_y;
-	double white_x;
-	double white_y;
-
-	Timing established[24];	/* Terminated by 0x0x0 */
-	Timing standard[8];
-
-	int n_detailed_timings;
-	DetailedTiming detailed_timings[4];
-	/* If monitor has a preferred
-	 * mode, it is the first one
-	 * (whether it has, is
-	 * determined by the
-	 * preferred_timing_includes
-	 * bit.
-	 */
-
-	/* Optional product description */
-	char dsc_serial_number[14];
-	char dsc_product_name[14];
-	char dsc_string[14]; /* Unspecified ASCII data */
-};
-
-MonitorInfo* decode_edid(const uchar* data);
-char* make_display_name(const MonitorInfo* info);
-
-#endif /* !EDID_H */

src/xfce-rr-config.h

-/* xfce-rr-config.h
- * -*- c-basic-offset: 4 -*-
- *
- * Copyright 2007, 2008, Red Hat, Inc.
- * Copyright 2010 Giovanni Campagna
- * 
- * This file is part of the Mate Library.
- * 
- * The Mate Library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * The Mate Library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- * 
- * You should have received a copy of the GNU Library General Public
- * License along with the Mate Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA  02110-1301, USA.
- * 
- * Author: Soren Sandmann <sandmann@redhat.com>
- */
-#ifndef XFCE_RR_CONFIG_H
-#define XFCE_RR_CONFIG_H
-
-#include "xfce-rr.h"
-#include <glib.h>
-#include <glib-object.h>
-
-typedef struct XfceRROutputInfoPrivate XfceRROutputInfoPrivate;
-typedef struct XfceRRConfigPrivate XfceRRConfigPrivate;
-
-typedef struct
-{
-    GObject parent;
-
-    /*< private >*/
-    XfceRROutputInfoPrivate *priv;
-} XfceRROutputInfo;
-
-typedef struct
-{
-    GObjectClass parent_class;
-} XfceRROutputInfoClass;
-
-#define XFCE_TYPE_RR_OUTPUT_INFO                  (xfce_rr_output_info_get_type())
-#define XFCE_RR_OUTPUT_INFO(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), XFCE_TYPE_RR_OUTPUT_INFO, XfceRROutputInfo))
-#define XFCE_IS_RR_OUTPUT_INFO(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), XFCE_TYPE_RR_OUTPUT_INFO))
-#define XFCE_RR_OUTPUT_INFO_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), XFCE_TYPE_RR_OUTPUT_INFO, XfceRROutputInfoClass))
-#define XFCE_IS_RR_OUTPUT_INFO_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), XFCE_TYPE_RR_OUTPUT_INFO))
-#define XFCE_RR_OUTPUT_INFO_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), XFCE_TYPE_RR_OUTPUT_INFO, XfceRROutputInfoClass))
-
-GType xfce_rr_output_info_get_type (void);
-
-typedef struct
-{
-    GObject parent;
-
-    /*< private >*/
-    XfceRRConfigPrivate *priv;
-} XfceRRConfig;
-
-typedef struct
-{
-    GObjectClass parent_class;
-} XfceRRConfigClass;
-
-#define XFCE_TYPE_RR_CONFIG                  (xfce_rr_config_get_type())
-#define XFCE_RR_CONFIG(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), XFCE_TYPE_RR_CONFIG, XfceRRConfig))
-#define XFCE_IS_RR_CONFIG(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), XFCE_TYPE_RR_CONFIG))
-#define XFCE_RR_CONFIG_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), XFCE_TYPE_RR_CONFIG, XfceRRConfigClass))
-#define XFCE_IS_RR_CONFIG_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), XFCE_TYPE_RR_CONFIG))
-#define XFCE_RR_CONFIG_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), XFCE_TYPE_RR_CONFIG, XfceRRConfigClass))
-
-GType               xfce_rr_config_get_type     (void);
-
-#endif

src/xfce-rr-output-info.c

-/* xfce-rr-output-info.c
- * -*- c-basic-offset: 4 -*-
- *
- * Copyright 2010 Giovanni Campagna
- *
- * This file is part of the Mate Desktop Library.
- *
- * The Mate Desktop Library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * The Mate Library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with the Mate Desktop Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-
-#include <config.h>
-
-#include "xfce-rr-config.h"
-
-#include "edid.h"
-#include "xfce-rr-private.h"
-
-G_DEFINE_TYPE (XfceRROutputInfo, xfce_rr_output_info, G_TYPE_OBJECT)
-
-static void
-xfce_rr_output_info_init (XfceRROutputInfo *self)
-{
-    self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, XFCE_TYPE_RR_OUTPUT_INFO, XfceRROutputInfoPrivate);
-
-    self->priv->name = NULL;
-    self->priv->on = FALSE;
-    self->priv->display_name = NULL;
-}
-
-static void
-xfce_rr_output_info_finalize (GObject *gobject)
-{
-    XfceRROutputInfo *self = XFCE_RR_OUTPUT_INFO (gobject);
-
-    g_free (self->priv->name);
-    g_free (self->priv->display_name);
-
-    G_OBJECT_CLASS (xfce_rr_output_info_parent_class)->finalize (gobject);
-}
-
-static void
-xfce_rr_output_info_class_init (XfceRROutputInfoClass *klass)
-{
-    GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-    g_type_class_add_private (klass, sizeof (XfceRROutputInfoPrivate));
-
-    gobject_class->finalize = xfce_rr_output_info_finalize;
-}

src/xfce-rr-private.h

@@ -72,13 +72,6 @@ struct XfceRROutputInfoPrivate
     gboolean            primary;
 };
 
-struct XfceRRConfigPrivate
-{
-  gboolean clone;
-  XfceRRScreen *screen;
-  XfceRROutputInfo **outputs;
-};
-
 gboolean _xfce_rr_output_name_is_laptop (const char *name);
 
 #endif

src/xfce-rr.c

@@ -39,7 +39,6 @@
 
 #undef MATE_DISABLE_DEPRECATED
 #include "xfce-rr.h"
-#include "xfce-rr-config.h"
 
 #include "xfce-rr-private.h"