diff options
| -rw-r--r-- | src/windowlist.c | 2 | ||||
| -rw-r--r-- | src/xfce-backdrop.c | 2 | ||||
| -rw-r--r-- | src/xfce-desktop.c | 21 |
3 files changed, 3 insertions, 22 deletions
diff --git a/src/windowlist.c b/src/windowlist.c index c886cff5..474ee097 100644 --- a/src/windowlist.c +++ b/src/windowlist.c @@ -159,7 +159,7 @@ windowlist_create(GdkScreen *gscreen) gint nworkspaces, i; NetkWorkspace *active_workspace, *netk_workspace; gchar *ws_label, *rm_label; - const gchar *ws_name; + const gchar *ws_name = NULL; GList *windows, *l; NetkWindow *netk_window; gint w, h; diff --git a/src/xfce-backdrop.c b/src/xfce-backdrop.c index fee159f2..0d56bab0 100644 --- a/src/xfce-backdrop.c +++ b/src/xfce-backdrop.c @@ -493,7 +493,7 @@ xfce_backdrop_get_pixbuf(XfceBackdrop *backdrop) { GdkPixbuf *final_image, *image = NULL, *tmp; gint i, j; - gint w, h, iw, ih; + gint w, h, iw = 0, ih = 0; XfceBackdropImageStyle istyle; gint dx, dy, xo, yo; gdouble xscale, yscale; diff --git a/src/xfce-desktop.c b/src/xfce-desktop.c index 167610b3..e6d15048 100644 --- a/src/xfce-desktop.c +++ b/src/xfce-desktop.c @@ -71,7 +71,6 @@ static void xfce_desktop_class_init(XfceDesktopClass *klass); static void xfce_desktop_init(XfceDesktop *desktop); static void xfce_desktop_finalize(GObject *object); -static void xfce_desktop_destroy(GtkObject *object); struct _XfceDesktopPriv { @@ -585,16 +584,12 @@ static void xfce_desktop_class_init(XfceDesktopClass *klass) { GObjectClass *gobject_class; - GtkObjectClass *gtkobject_class; gobject_class = (GObjectClass *)klass; - gtkobject_class = (GtkObjectClass *)klass; parent_class = g_type_class_peek_parent(klass); gobject_class->finalize = xfce_desktop_finalize; - - gtkobject_class->destroy = xfce_desktop_destroy; } static void @@ -605,7 +600,7 @@ xfce_desktop_init(XfceDesktop *desktop) } static void -xfce_desktop_destroy(GtkObject *object) +xfce_desktop_finalize(GObject *object) { XfceDesktop *desktop = XFCE_DESKTOP(object); gint i; @@ -614,10 +609,6 @@ xfce_desktop_destroy(GtkObject *object) g_return_if_fail(XFCE_IS_DESKTOP(desktop)); - if(desktop->priv->destroyed) - return; - desktop->priv->destroyed = TRUE; - groot = gdk_screen_get_root_window(desktop->priv->gscreen); gdk_property_delete(groot, gdk_atom_intern("XFCE_DESKTOP_WINDOW", FALSE)); gdk_property_delete(groot, gdk_atom_intern("NAUTILUS_DESKTOP_WINDOW_ID", FALSE)); @@ -634,16 +625,6 @@ xfce_desktop_destroy(GtkObject *object) desktop->priv->backdrops = NULL; } - GTK_OBJECT_CLASS(parent_class)->destroy(object); -} - -static void -xfce_desktop_finalize(GObject *object) -{ - XfceDesktop *desktop = XFCE_DESKTOP(object); - - g_return_if_fail(desktop != NULL); - g_free(desktop->priv); desktop->priv = NULL; |