Thu, 29 Jun 2017 15:33:29 -0500
gtkidle: Port XScreensaver to DBus ScreenSaver interfaces
Modern Linux desktops use one of 3 DBus interfaces for querying if
the screensaver is currently active. There's a FreeDesktop one, a
GNOME one, and a KDE one. Rather than querying XScreensaver, which
may not be available, such as with Wayland, this patch ports Pidgin's
idle checking function to use these modern DBus interfaces.
Because Gio includes built-in DBus API, this patch also drops the
guards around pidgin_get_time_idle(), which also re-enables the
Win32 code which wasn't enabled with the previous guards.
|
38465
7639468580d6
Add artwork to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
1 | pidginpixmapdir = get_option('datadir') + '/pixmaps/pidgin' |
|
7639468580d6
Add artwork to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
2 | |
|
7639468580d6
Add artwork to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
3 | subdir('emotes/default/24') |
|
7639468580d6
Add artwork to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
4 | subdir('emotes/small/16') |
|
7639468580d6
Add artwork to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
5 | |
|
7639468580d6
Add artwork to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
6 | if INSTALL_PIXMAPS |
|
7639468580d6
Add artwork to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
7 | install_data('logo.png', 'arrow-down.xpm', 'arrow-left.xpm', 'arrow-right.xpm', 'arrow-up.xpm', |
|
7639468580d6
Add artwork to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
8 | install_dir : pidginpixmapdir) |
|
7639468580d6
Add artwork to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
9 | |
|
38517
286bb278081b
Make icons/pixmaps install consistent with Autotools.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
38465
diff
changeset
|
10 | # Some of these don't use install_subdir because it deletes the target, |
|
286bb278081b
Make icons/pixmaps install consistent with Autotools.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
38465
diff
changeset
|
11 | # and some target directories probably have something in them, for those |
|
286bb278081b
Make icons/pixmaps install consistent with Autotools.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
38465
diff
changeset
|
12 | # installing somewhere with existing stuff. Additionally, we have |
|
286bb278081b
Make icons/pixmaps install consistent with Autotools.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
38465
diff
changeset
|
13 | # extra stuff in our directories we don't want to install. |
|
38465
7639468580d6
Add artwork to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
14 | install_subdir('animations', |
|
7639468580d6
Add artwork to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
15 | install_dir : pidginpixmapdir) |
|
38517
286bb278081b
Make icons/pixmaps install consistent with Autotools.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
38465
diff
changeset
|
16 | install_data('edit.png', 'info.png', 'pause.png', |
|
286bb278081b
Make icons/pixmaps install consistent with Autotools.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
38465
diff
changeset
|
17 | install_dir : join_paths(pidginpixmapdir, 'buttons')) |
|
286bb278081b
Make icons/pixmaps install consistent with Autotools.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
38465
diff
changeset
|
18 | subdir('dialogs') |
|
38465
7639468580d6
Add artwork to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
19 | install_subdir('e2ee', |
|
7639468580d6
Add artwork to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
20 | install_dir : pidginpixmapdir) |
|
7639468580d6
Add artwork to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
21 | install_subdir('emblems', |
|
7639468580d6
Add artwork to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
22 | install_dir : pidginpixmapdir) |
|
38517
286bb278081b
Make icons/pixmaps install consistent with Autotools.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
38465
diff
changeset
|
23 | subdir('icons') |
|
286bb278081b
Make icons/pixmaps install consistent with Autotools.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
38465
diff
changeset
|
24 | subdir('protocols') |
|
286bb278081b
Make icons/pixmaps install consistent with Autotools.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
38465
diff
changeset
|
25 | subdir('status') |
|
286bb278081b
Make icons/pixmaps install consistent with Autotools.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
38465
diff
changeset
|
26 | subdir('toolbar') |
|
286bb278081b
Make icons/pixmaps install consistent with Autotools.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
38465
diff
changeset
|
27 | subdir('tray') |
|
38465
7639468580d6
Add artwork to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
28 | endif |