summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Lortie <desrt@desrt.ca>2012-07-11 13:00:17 -0400
committerRyan Lortie <desrt@desrt.ca>2012-07-11 13:02:31 -0400
commit311b2866c2ed86ee972763edba723088fe0a5164 (patch)
treec430520951eaba3c38396daea15e65f5a96610ee
parent23817c69efdda2239da847e2d2d9f6326a42ae39 (diff)
downloaddconf-311b2866c2ed86ee972763edba723088fe0a5164.tar.gz
Remove workaround for GCC's obnoxious behaviour
The workaround is in GLib now, so we don't have to do it.
-rw-r--r--engine/dconf-engine-source.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/engine/dconf-engine-source.c b/engine/dconf-engine-source.c
index 2d0e2bd..06a775c 100644
--- a/engine/dconf-engine-source.c
+++ b/engine/dconf-engine-source.c
@@ -40,18 +40,13 @@ dconf_engine_source_free (DConfEngineSource *source)
g_free (source);
}
-/* warning: function called through a non-compatible type [enabled by default]
- * note: if this code is reached, the program will abort
- */
-static void i_hate_gcc (gpointer x) { gvdb_table_unref (x); }
-
gboolean
dconf_engine_source_refresh (DConfEngineSource *source)
{
if (source->vtable->needs_reopen (source))
{
- g_clear_pointer (&source->values, i_hate_gcc);
- g_clear_pointer (&source->locks, i_hate_gcc);
+ g_clear_pointer (&source->values, gvdb_table_unref);
+ g_clear_pointer (&source->locks, gvdb_table_unref);
source->values = source->vtable->reopen (source);
if (source->values)