[Xfce4-commits] [xfce/xfce4-session] 30/30: Merge gtk3 and gdbus changes to master

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository xfce/xfce4-session.

commit e6aafcf444e529648e4542292c29084b3a9e66e5
Merge: 1c3e55e 91860af
Author: Eric Koegel <eric.koegel at gmail.com>
Date:   Sun May 15 19:00:43 2016 +0300

    Merge gtk3 and gdbus changes to master

 .gitignore                                         |   6 +
 configure.ac.in                                    |  17 +-
 engines/balou/balou-theme.c                        | 108 +++--
 engines/balou/balou-theme.h                        |   7 +-
 engines/balou/balou.c                              | 228 +++------
 engines/balou/balou.h                              |   6 +-
 engines/balou/config.c                             |  40 +-
 engines/balou/engine.c                             |   1 -
 engines/mice/mice.c                                | 122 ++---
 engines/simple/simple.c                            | 181 ++++---
 libxfsm/xfsm-util.c                                |  14 +-
 settings/Makefile.am                               |  32 +-
 settings/main.c                                    |  47 +-
 settings/session-editor.c                          | 291 +++++++-----
 settings/splash-settings.c                         |  12 +-
 settings/xfae-dialog.c                             |  46 +-
 settings/xfae-window.c                             |  35 +-
 ...on-settings.glade => xfce4-session-settings.ui} | 403 ++++++++--------
 xfce4-session-logout/Makefile.am                   |   6 +-
 xfce4-session-logout/main.c                        | 128 ++---
 xfce4-session/Makefile.am                          |  32 +-
 xfce4-session/main.c                               | 180 +++----
 xfce4-session/xfsm-chooser.c                       |  13 +-
 xfce4-session/xfsm-client.c                        | 356 +++++++-------
 xfce4-session/xfsm-client.h                        |   4 +-
 xfce4-session/xfsm-compat-gnome.c                  |  10 +-
 xfce4-session/xfsm-compat-kde.c                    |   4 +-
 xfce4-session/xfsm-consolekit.c                    | 290 ++++++------
 xfce4-session/xfsm-error.c                         |  36 +-
 xfce4-session/xfsm-error.h                         |   6 +-
 xfce4-session/xfsm-fadeout.c                       |  57 +--
 xfce4-session/xfsm-legacy.c                        |  32 +-
 xfce4-session/xfsm-logout-dialog.c                 | 159 +++++--
 xfce4-session/xfsm-manager.c                       | 522 +++++++++++----------
 xfce4-session/xfsm-manager.h                       |   2 +-
 xfce4-session/xfsm-shutdown-fallback.c             |   6 +-
 xfce4-session/xfsm-shutdown.c                      | 135 ++++--
 xfce4-session/xfsm-shutdown.h                      |   9 +
 xfce4-session/xfsm-splash-screen.c                 |  10 +-
 xfce4-session/xfsm-systemd.c                       |   2 -
 xfce4-session/xfsm-upower.c                        | 423 -----------------
 xfce4-session/xfsm-upower.h                        |  58 ---
 42 files changed, 1913 insertions(+), 2163 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.