brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge up to commit 92e608bd0f3807314c45ee5f5daf6ba781c27d58 of gdm

Browse Source 
Pull in a few fixes from gdm trunk for gdm-user.c
This commit is contained in:
Colin Walters 2009-07-07 20:45:43 -04:00 committed by Colin Walters
parent 1cb6fc004b
commit f353283a40
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gdmuser/gdm-user.c
View File

@ -20,6 +20,7 @@
#include <config.h> #include <config.h>
#include <float.h>
#include <string.h> #include <string.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -881,7 +882,7 @@ curved_rectangle (cairo_t *cr,
x1 = x0 + width; x1 = x0 + width;
y1 = y0 + height; y1 = y0 + height;
if (!width || !height) { if (width < FLT_EPSILON || height < FLT_EPSILON) {
return; return;
} }
@ -1156,8 +1157,8 @@ gdm_user_render_icon (GdmUser *user,
} else { } else {
pixbuf = NULL; pixbuf = NULL;
} }
out:
g_free (path); g_free (path);
out:
if (pixbuf != NULL) { if (pixbuf != NULL) {
framed = frame_pixbuf (pixbuf); framed = frame_pixbuf (pixbuf);