diff options
| author | Christian Persch <chpe@gnome.org> | 2010-05-13 12:59:18 (GMT) |
|---|---|---|
| committer | Carlos Garcia Campos <carlosgc@gnome.org> | 2010-05-25 07:38:31 (GMT) |
| commit | 5478e7ba12be2167143e58a33508a555d8533813 (patch) | |
| tree | 196090205d3b2b325060b3ab9bf65002f3e8f04b /cut-n-paste/totem-screensaver/totem-scrsaver.h | |
| parent | 2baf0a33fd22d79a6803cdff480e8a293b2f0049 (diff) | |
[shell] Remove DBUS conditionals from TotemScrsaver
Now that GDBus is in GIO, there's no need to conditionally compile this
code. Just allow passing %NULL for @connection in totem_scrsaver_new()
to disable using DBUS to inhibit the screensaver.
Diffstat (limited to 'cut-n-paste/totem-screensaver/totem-scrsaver.h')
| -rw-r--r-- | cut-n-paste/totem-screensaver/totem-scrsaver.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/cut-n-paste/totem-screensaver/totem-scrsaver.h b/cut-n-paste/totem-screensaver/totem-scrsaver.h index d175896..b9a5606 100644 --- a/cut-n-paste/totem-screensaver/totem-scrsaver.h +++ b/cut-n-paste/totem-screensaver/totem-scrsaver.h @@ -23,10 +23,7 @@ #define TOTEM_SCRSAVER_H #include <glib.h> -#include <glib-object.h> -#ifdef ENABLE_DBUS #include <gio/gio.h> -#endif G_BEGIN_DECLS @@ -50,11 +47,7 @@ struct TotemScrsaverClass { }; GType totem_scrsaver_get_type (void); -#ifdef ENABLE_DBUS -TotemScrsaver *totem_scrsaver_new (GDBusConnection *connection); -#else -TotemScrsaver *totem_scrsaver_new (void); -#endif +TotemScrsaver *totem_scrsaver_new (GDBusConnection *connection); void totem_scrsaver_enable (TotemScrsaver *scr); void totem_scrsaver_disable (TotemScrsaver *scr); void totem_scrsaver_set_state (TotemScrsaver *scr, |