diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2011-11-30 13:39:56 +1100 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2011-11-30 13:39:56 +1100 |
| commit | caa2b99d423b4af21c835f2443acab570e29e46e (patch) | |
| tree | 9ad29bc7981f19805406ddb8973bf8c46dc845fa /liblightdm-gobject | |
| parent | c387eda5540025d0753cbc5f793c1e3dc2b49692 (diff) | |
| parent | aeb8bedaf75b144dea7d12fedf9d5b5c18aefb9a (diff) | |
| download | lightdm-caa2b99d423b4af21c835f2443acab570e29e46e.tar.gz | |
Merge in liblightdm-qt-2 changes
Diffstat (limited to 'liblightdm-gobject')
| -rw-r--r-- | liblightdm-gobject/lightdm.h | 2 | ||||
| -rw-r--r-- | liblightdm-gobject/lightdm/power.h | 2 | ||||
| -rw-r--r-- | liblightdm-gobject/lightdm/system.h | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/liblightdm-gobject/lightdm.h b/liblightdm-gobject/lightdm.h index a23ecdfc..43603e22 100644 --- a/liblightdm-gobject/lightdm.h +++ b/liblightdm-gobject/lightdm.h @@ -20,6 +20,4 @@ #include "lightdm/system.h" #include "lightdm/user.h" -G_END_DECLS - #endif /* _LIGHTDM_H_ */ diff --git a/liblightdm-gobject/lightdm/power.h b/liblightdm-gobject/lightdm/power.h index 284382b2..c8d22198 100644 --- a/liblightdm-gobject/lightdm/power.h +++ b/liblightdm-gobject/lightdm/power.h @@ -12,6 +12,8 @@ #ifndef _LIGHTDM_POWER_H_ #define _LIGHTDM_POWER_H_ +G_BEGIN_DECLS + gboolean lightdm_get_can_suspend (void); gboolean lightdm_suspend (GError **error); diff --git a/liblightdm-gobject/lightdm/system.h b/liblightdm-gobject/lightdm/system.h index f070ec80..a5510403 100644 --- a/liblightdm-gobject/lightdm/system.h +++ b/liblightdm-gobject/lightdm/system.h @@ -14,6 +14,8 @@ #include <glib-object.h> +G_BEGIN_DECLS + const gchar *lightdm_get_hostname (void); G_END_DECLS |