← Back to branch summary

~noskcaj/ubuntu/saucy/sflphone/merge-1.2.3-2

« back to all changes in this revision

Viewing changes to gnome/src/eel-gconf-extensions.c

  • Committer: Package Import Robot
  • Author(s): Mark Purcell
  • Date: 2012-05-19 21:46:37 UTC
  • mfrom: (1.1.7)
  • Revision ID: package-import@ubuntu.com-20120519214637-la8rbrford5kj6m3
Tags: 1.1.0-1
http://bugs.debian.org/663282
http://bugs.debian.org/665789
* New upstream release 
  - Fixes "FTBFS with libccrtp-dev/2.0.2 from experimental" (Closes: #663282)
* NEW Maintainer: Debian VoIP Team - Thanks Francois for your work.
  - (Closes: #665789: O: sflphone -- SIP and IAX2 compatible VoIP phone)
* Added Build-Depends: libdbus-c++-bin
* Add gcc47-fixes.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
gnome/src/eel-gconf-extensions.c
22
22
   Authors: Ramiro Estrugo <ramiro@eazel.com>
23
23
*/
24
24
 
 
25
#include "config.h"
 
26
#include <glib/gi18n.h>
25
27
#include <stdlib.h>
26
 
#include "config.h"
27
28
#include "eel-gconf-extensions.h"
28
29
 
29
30
#include <gconf/gconf-client.h>
30
31
#include <gconf/gconf.h>
31
32
#include <gtk/gtk.h>
32
 
#include <glib/gi18n.h>
 
33
#include <glib.h>
33
34
 
34
35
static GConfClient *global_gconf_client = NULL;
35
36
 
36
 
static void
37
 
global_client_free(void)
 
37
void eel_gconf_global_client_free(void)
38
38
{
39
 
    if (global_gconf_client == NULL) {
 
39
    if (global_gconf_client == NULL)
40
40
        return;
41
 
    }
42
41
 
43
42
    g_object_unref(G_OBJECT(global_gconf_client));
44
43
    global_gconf_client = NULL;
81
80
 
82
81
    }
83
82
 
84
 
    if (global_gconf_client == NULL) {
 
83
    if (global_gconf_client == NULL)
85
84
        global_gconf_client = gconf_client_get_default();
86
 
        g_atexit(global_client_free);
87
 
    }
88
85
 
89
86
    return global_gconf_client;
90
87
}