~ubuntu-branches/ubuntu/natty/gecko-mediaplayer/natty

« back to all changes in this revision

Viewing changes to src/plugin_types_qt.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Cesare Tirabassi
  • Date: 2007-12-14 17:26:45 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20071214172645-8ul52mlwizw9qed4
Tags: 0.5.3-0ubuntu1
* New upstream release
* Update watch file in accordance with upstream change of download page
* Remove patch fix-width+height-initialisation.patch applied upstream
* Add xulrunner-1.9 and xulrunner support
* debian/control:
  - bump Standards-Version to 3.7.3
  - move Homepage: to proper field in accordance with new Debian policy

Show diffs side-by-side

added added

removed removed

Lines of Context:
40
40
gchar *GetMIMEDescription()
41
41
{
42
42
    gchar MimeTypes[4000];
43
 
    GConfClient *gconf;
44
 
    gboolean qt_disabled;
 
43
    GConfClient *gconf = NULL;
 
44
    gboolean qt_disabled = FALSE;
45
45
    
46
46
    g_type_init();
47
47
    gconf = gconf_client_get_default();
48
 
    qt_disabled = gconf_client_get_bool(gconf, DISABLE_QT, NULL);
49
 
    g_object_unref(G_OBJECT(gconf));
50
 
 
 
48
    if (gconf != NULL) {
 
49
        qt_disabled = gconf_client_get_bool(gconf, DISABLE_QT, NULL);
 
50
        g_object_unref(G_OBJECT(gconf));
 
51
    }
 
52
    
51
53
    if (qt_disabled) {
52
54
        return NULL;
53
55
    } else {