summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasmine Hassan <[email protected]>2012-11-29 16:26:53 +0200
committerJasmine Hassan <[email protected]>2012-12-01 18:55:56 +0200
commit000d8ecc347642bc28fb4cbbb5f2dd730f89b519 (patch)
treef3c583fb3109579702171edd36308f1b655eb651
parentd7ed4e67e748117787810a021c8e15a7a97fe169 (diff)
downloadmate-settings-daemon-000d8ecc347642bc28fb4cbbb5f2dd730f89b519.tar.bz2
mate-settings-daemon-000d8ecc347642bc28fb4cbbb5f2dd730f89b519.tar.xz
[background] GCC 4.6 warning fixes
http://git.gnome.org/browse/gnome-settings-daemon/commit/?id=da9bd9769caa0f776edf5636c6ae09ba425d6f6e
-rw-r--r--plugins/background/msd-background-manager.c64
1 files changed, 24 insertions, 40 deletions
diff --git a/plugins/background/msd-background-manager.c b/plugins/background/msd-background-manager.c
index 234dc4a..74d257c 100644
--- a/plugins/background/msd-background-manager.c
+++ b/plugins/background/msd-background-manager.c
@@ -97,7 +97,6 @@ caja_is_drawing_background (MsdBackgroundManager *manager)
unsigned long nitems;
unsigned long bytes_after;
unsigned char* data;
- int retval;
Atom wmclass_atom;
gboolean running;
gint error;
@@ -116,18 +115,18 @@ caja_is_drawing_background (MsdBackgroundManager *manager)
return FALSE;
}
- retval = XGetWindowProperty(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()),
- GDK_ROOT_WINDOW(),
- window_id_atom,
- 0,
- 1,
- False,
- XA_WINDOW,
- &actual_type,
- &actual_format,
- &nitems,
- &bytes_after,
- &data);
+ XGetWindowProperty (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()),
+ GDK_ROOT_WINDOW(),
+ window_id_atom,
+ 0,
+ 1,
+ False,
+ XA_WINDOW,
+ &actual_type,
+ &actual_format,
+ &nitems,
+ &bytes_after,
+ &data);
if (data != NULL)
{
@@ -153,18 +152,18 @@ caja_is_drawing_background (MsdBackgroundManager *manager)
gdk_error_trap_push();
- retval = XGetWindowProperty(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()),
- caja_xid,
- wmclass_atom,
- 0,
- 24,
- False,
- XA_STRING,
- &actual_type,
- &actual_format,
- &nitems,
- &bytes_after,
- &data);
+ XGetWindowProperty (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()),
+ caja_xid,
+ wmclass_atom,
+ 0,
+ 24,
+ False,
+ XA_STRING,
+ &actual_type,
+ &actual_format,
+ &nitems,
+ &bytes_after,
+ &data);
error = gdk_error_trap_pop();
@@ -538,10 +537,6 @@ msd_background_manager_set_property (GObject* object,
const GValue* value,
GParamSpec* pspec)
{
- MsdBackgroundManager* self;
-
- self = MSD_BACKGROUND_MANAGER(object);
-
switch (prop_id)
{
default:
@@ -556,10 +551,6 @@ msd_background_manager_get_property (GObject* object,
GValue* value,
GParamSpec* pspec)
{
- MsdBackgroundManager* self;
-
- self = MSD_BACKGROUND_MANAGER(object);
-
switch (prop_id)
{
default:
@@ -574,9 +565,6 @@ msd_background_manager_constructor (GType type,
GObjectConstructParam* construct_properties)
{
MsdBackgroundManager* background_manager;
- MsdBackgroundManagerClass* klass;
-
- klass = MSD_BACKGROUND_MANAGER_CLASS(g_type_class_peek(MSD_TYPE_BACKGROUND_MANAGER));
background_manager = MSD_BACKGROUND_MANAGER(G_OBJECT_CLASS(msd_background_manager_parent_class)->constructor(type,
n_construct_properties,
@@ -587,10 +575,6 @@ msd_background_manager_constructor (GType type,
static void
msd_background_manager_dispose (GObject* object)
{
- MsdBackgroundManager* background_manager;
-
- background_manager = MSD_BACKGROUND_MANAGER(object);
-
G_OBJECT_CLASS(msd_background_manager_parent_class)->dispose(object);
}