diff options
| author | Kjartan Maraas <kmaraas@gnome.org> | 2005-06-10 18:49:06 +0000 |
|---|---|---|
| committer | Kjartan Maraas <kmaraas@src.gnome.org> | 2005-06-10 18:49:06 +0000 |
| commit | 49601b934df132b30157201c257910e7aba8aef6 (patch) | |
| tree | 3f3bd79145277b6e525b6135202e6e68dc6c46cb | |
| parent | 8865b5d08666bd2d5a8e247a6bf39ed75b8f90c9 (diff) | |
| download | gnome-control-center-49601b934df132b30157201c257910e7aba8aef6.tar.gz | |
GCC4 build issues.NAUTILUS_SEARCH_BRANCH_ANCHORNAUTILUS_2_12_0NAUTILUS_2_11_92NAUTILUS_2_11_91NAUTILUS_2_11_90NAUTILUS_2_11_4NAUTILUS_2_11_3
2005-06-10 Kjartan Maraas <kmaraas@gnome.org>
* applier.c: (render_wallpaper), (is_nautilus_running): GCC4
build issues.
| -rw-r--r-- | libbackground/ChangeLog | 5 | ||||
| -rw-r--r-- | libbackground/applier.c | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/libbackground/ChangeLog b/libbackground/ChangeLog index ab3ec5842..bedaeb605 100644 --- a/libbackground/ChangeLog +++ b/libbackground/ChangeLog @@ -1,3 +1,8 @@ +2005-06-10 Kjartan Maraas <kmaraas@gnome.org> + + * applier.c: (render_wallpaper), (is_nautilus_running): GCC4 + build issues. + 2005-05-08 Richard Hoelscher <rah@rahga.com> * applier.c (refresh_render): Remove egg_pixbuf_new_from_file_at_size, diff --git a/libbackground/applier.c b/libbackground/applier.c index 21e3de272..68da91b62 100644 --- a/libbackground/applier.c +++ b/libbackground/applier.c @@ -758,8 +758,8 @@ render_background (BGApplier *bg_applier, const BGPreferences *prefs) static void render_wallpaper (BGApplier *bg_applier, const BGPreferences *prefs) { - GdkRectangle src_geom; - GdkRectangle dest_geom; + GdkRectangle src_geom = { 0, }; + GdkRectangle dest_geom = { 0, }; GdkRectangle virtual_geom; GdkPixbuf *prescaled_pixbuf = NULL; guint alpha; @@ -1624,8 +1624,8 @@ is_nautilus_running (void) bytes_after == 0 && actual_format == 8 && data != NULL && - !strcmp (data, "desktop_window") && - !strcmp (data + strlen (data) + 1, "Nautilus")) + !strcmp ((char *)data, "desktop_window") && + !strcmp ((char *)data + strlen ((char *)data) + 1, "Nautilus")) running = TRUE; else running = FALSE; |