applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Return TRUE if pixmap is NULL. (create_pixmap): Only set pixmap if not

Browse source 
2002-04-17  Rachel Hestilow  <hestilow@ximian.com>

	* applier.c (need_root_pixmap_p): Return TRUE if pixmap is NULL.
	(create_pixmap): Only set pixmap if not already set.
This commit is contained in:
Rachel Hestilow 2002-04-18 05:54:18 +00:00 • committed by Rachel Hestilow
parent 6f03bca307
commit c5f228b8ea
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libbackground/ChangeLog
View file

@ -1,3 +1,8 @@
2002-04-17 Rachel Hestilow <hestilow@ximian.com>
* applier.c (need_root_pixmap_p): Return TRUE if pixmap is NULL.
(create_pixmap): Only set pixmap if not already set.
2002-04-17 Anders Carlsson <andersca@gnu.org>
* preferences.c: (bg_preferences_finalize), (bg_preferences_load):

7
libbackground/applier.c
View file

@ -892,7 +892,8 @@ create_pixmap (BGApplier *bg_applier, const BGPreferences *prefs)
#if 0
bg_applier->p->pixmap = GTK_PIXMAP (bg_applier->p->preview_widget)->pixmap;
#else
gtk_image_get_pixmap (GTK_IMAGE (bg_applier->p->preview_widget), &bg_applier->p->pixmap, NULL);
if (!bg_applier->p->pixmap)
gtk_image_get_pixmap (GTK_IMAGE (bg_applier->p->preview_widget), &bg_applier->p->pixmap, NULL);
#endif
bg_applier->p->pixmap_is_set = TRUE;
break;
@ -1276,7 +1277,9 @@ need_wallpaper_load_p (const BGApplier *bg_applier, const BGPreferences *prefs)
static gboolean
need_root_pixmap_p (const BGApplier *bg_applier, const BGPreferences *prefs)
{
if (prefs->wallpaper_enabled == FALSE && prefs->gradient_enabled == FALSE)
if (bg_applier->p->pixmap == NULL)
return TRUE;
else if (prefs->wallpaper_enabled == FALSE && prefs->gradient_enabled == FALSE)
return FALSE;
else if (bg_applier->p->last_prefs == NULL)
return TRUE;