summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxime Villard <max@m00nbsd.net>2013-08-21 09:27:52 -0400
committerRay Strode <rstrode@redhat.com>2013-08-21 09:28:39 -0400
commit029a6072a4b75f9b64012dc10f11d3b17c0285f8 (patch)
tree354e959e27a8e5283181829862d617d7477615aa
parentc9e76f66b3c9cb7b06dd6912a2c7f36b79ac21a7 (diff)
downloadgnome-session-029a6072a4b75f9b64012dc10f11d3b17c0285f8.tar.gz
Drop dead code
-rw-r--r--gnome-session/gsm-autostart-app.c2
-rw-r--r--gnome-session/gsm-inhibit-dialog.c4
-rw-r--r--gnome-session/gsm-manager.c1
-rw-r--r--gnome-session/gsm-session-save.c2
-rw-r--r--tools/gnome-session-check-accelerated.c2
5 files changed, 5 insertions, 6 deletions
diff --git a/gnome-session/gsm-autostart-app.c b/gnome-session/gsm-autostart-app.c
index df8dd28d..f90e5282 100644
--- a/gnome-session/gsm-autostart-app.c
+++ b/gnome-session/gsm-autostart-app.c
@@ -906,7 +906,7 @@ static int
_signal_pid (int pid,
int signal)
{
- int status = -1;
+ int status;
/* perhaps block sigchld */
g_debug ("GsmAutostartApp: sending signal %d to process %d", signal, pid);
diff --git a/gnome-session/gsm-inhibit-dialog.c b/gnome-session/gsm-inhibit-dialog.c
index b8c8a63c..a3c9c09a 100644
--- a/gnome-session/gsm-inhibit-dialog.c
+++ b/gnome-session/gsm-inhibit-dialog.c
@@ -174,8 +174,8 @@ scale_pixbuf (GdkPixbuf *pixbuf,
{
int pw;
int ph;
- float scale_factor_x = 1.0;
- float scale_factor_y = 1.0;
+ float scale_factor_x;
+ float scale_factor_y;
float scale_factor = 1.0;
pw = gdk_pixbuf_get_width (pixbuf);
diff --git a/gnome-session/gsm-manager.c b/gnome-session/gsm-manager.c
index bcd4a7e3..dd47b69a 100644
--- a/gnome-session/gsm-manager.c
+++ b/gnome-session/gsm-manager.c
@@ -1973,7 +1973,6 @@ register_manager (GsmManager *manager)
GError *error = NULL;
DBusConnection *connection;
- error = NULL;
manager->priv->connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
if (manager->priv->connection == NULL) {
if (error != NULL) {
diff --git a/gnome-session/gsm-session-save.c b/gnome-session/gsm-session-save.c
index aeb575f7..917347f0 100644
--- a/gnome-session/gsm-session-save.c
+++ b/gnome-session/gsm-session-save.c
@@ -177,7 +177,7 @@ gsm_session_clear_one_client (const char *filename,
GHashTable *discard_hash)
{
gboolean result = TRUE;
- GKeyFile *key_file = NULL;
+ GKeyFile *key_file;
char *discard_exec = NULL;
g_debug ("GsmSessionSave: removing '%s' from saved session", filename);
diff --git a/tools/gnome-session-check-accelerated.c b/tools/gnome-session-check-accelerated.c
index 3f10778b..a9ab6dec 100644
--- a/tools/gnome-session-check-accelerated.c
+++ b/tools/gnome-session-check-accelerated.c
@@ -75,7 +75,7 @@ property_notify_filter (GdkXEvent *xevent,
static gboolean
wait_for_property_notify (void)
{
- GdkDisplay *display = NULL;
+ GdkDisplay *display;
GdkScreen *screen;
GdkWindow *root;
Window rootwin;