← Back to branch summary

~ubuntu-branches/ubuntu/utopic/xfce4-settings/utopic

« back to all changes in this revision

Viewing changes to xfce4-settings-manager/main.c

  • Committer: Package Import Robot
  • Author(s): Jackson Doak
  • Date: 2014-01-21 07:13:03 UTC
  • mfrom: (1.3.7 experimental)
  • Revision ID: package-import@ubuntu.com-20140121071303-rk7u0h0c4x6xeusc
Tags: 4.11.1-1ubuntu1
* Merge from Debian experimental, remaining changes:
  - debian/patches/xubuntu_vanilla-session-themes.patch: Fix missing gtk and
    icon themes with the vanilla Xfce session.

Show diffs side-by-side

added added

removed removed

Lines of Context:
xfce4-settings-manager/main.c
28
28
#include <gtk/gtk.h>
29
29
#include <libxfce4util/libxfce4util.h>
30
30
#include <garcon/garcon.h>
 
31
#include <xfconf/xfconf.h>
31
32
 
32
33
#include "xfce-settings-manager-dialog.h"
33
34
 
79
80
        return EXIT_SUCCESS;
80
81
    }
81
82
 
 
83
    /* initialize xfconf */
 
84
    if (G_UNLIKELY (!xfconf_init (&error)))
 
85
    {
 
86
        /* print error and leave */
 
87
        g_critical ("Failed to connect to Xfconf daemon: %s", error->message);
 
88
        g_error_free (error);
 
89
 
 
90
        return EXIT_FAILURE;
 
91
    }
 
92
 
82
93
    garcon_set_environment ("XFCE");
83
94
 
84
95
    dialog = xfce_settings_manager_dialog_new ();
95
106
 
96
107
    gtk_main();
97
108
 
 
109
    xfconf_shutdown ();
 
110
 
98
111
    return EXIT_SUCCESS;
99
112
}