diff options
Diffstat (limited to 'widgets/misc')
| -rw-r--r-- | widgets/misc/ChangeLog | 9 | ||||
| -rw-r--r-- | widgets/misc/e-cursors.c | 2 | ||||
| -rw-r--r-- | widgets/misc/e-spinner.c | 18 | ||||
| -rw-r--r-- | widgets/misc/e-unicode.c | 4 |
4 files changed, 17 insertions, 16 deletions
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog index 2899ec0fa4..b5c74cbb2d 100644 --- a/widgets/misc/ChangeLog +++ b/widgets/misc/ChangeLog @@ -1,3 +1,12 @@ +2007-10-09 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #437579 + + * e-cursors.c: + * e-spinner.c: + * e-unicode.c: + Fix various compiler warnings. Patch from Milan Crha. + 2007-10-01 Milan Crha <mcrha@redhat.com> ** Fix for bug #413420 diff --git a/widgets/misc/e-cursors.c b/widgets/misc/e-cursors.c index 96b21bef97..5a709a6927 100644 --- a/widgets/misc/e-cursors.c +++ b/widgets/misc/e-cursors.c @@ -115,7 +115,7 @@ e_cursors_init (void) e_color_init (); for (i = 0; cursors [i].hot_x; i++){ - GdkBitmap *bitmap, *mask; + GdkBitmap *bitmap = NULL, *mask = NULL; if (cursors [i].hot_x < 0) cursors [i].cursor = gdk_cursor_new (cursors [i].hot_y); diff --git a/widgets/misc/e-spinner.c b/widgets/misc/e-spinner.c index 4f512a3c98..bbd5d2e5f2 100644 --- a/widgets/misc/e-spinner.c +++ b/widgets/misc/e-spinner.c @@ -101,6 +101,7 @@ static void e_spinner_cache_class_init (ESpinnerCacheClass *klass); static void e_spinner_cache_init (ESpinnerCache *cache); static GObjectClass *e_spinner_cache_parent_class; +static gpointer spinner_cache = NULL; static GType e_spinner_cache_get_type (void) @@ -484,24 +485,17 @@ e_spinner_cache_class_init (ESpinnerCacheClass *klass) g_type_class_add_private (object_class, sizeof (ESpinnerCachePrivate)); } -static ESpinnerCache *spinner_cache = NULL; - static ESpinnerCache * e_spinner_cache_ref (void) { - if (spinner_cache == NULL) + if (G_UNLIKELY (spinner_cache == NULL)) { - ESpinnerCache **cache_ptr; - spinner_cache = g_object_new (E_TYPE_SPINNER_CACHE, NULL); - cache_ptr = &spinner_cache; - g_object_add_weak_pointer (G_OBJECT (spinner_cache), - (gpointer *) cache_ptr); - - return spinner_cache; + g_object_add_weak_pointer ( + G_OBJECT (spinner_cache), &spinner_cache); } - - return g_object_ref (spinner_cache); + + return g_object_ref_sink (spinner_cache); } /* Spinner implementation */ diff --git a/widgets/misc/e-unicode.c b/widgets/misc/e-unicode.c index 409a88bd55..00d2eccef1 100644 --- a/widgets/misc/e-unicode.c +++ b/widgets/misc/e-unicode.c @@ -53,9 +53,7 @@ static gint e_canonical_decomposition (gunichar ch, gunichar * buf); static gunichar e_stripped_char (gunichar ch); -#ifndef NO_WARNINGS -#warning FIXME: this has not been ported fully yet - non ASCII people beware. -#endif +/* FIXME: this has not been ported fully yet - non ASCII people beware. */ /* * This my favourite |