diff options
Diffstat (limited to 'mate-base/mate-session-manager/files')
7 files changed, 1095 insertions, 0 deletions
diff --git a/mate-base/mate-session-manager/files/10-user-dirs-update-mate b/mate-base/mate-session-manager/files/10-user-dirs-update-mate new file mode 100644 index 00000000..35973aae --- /dev/null +++ b/mate-base/mate-session-manager/files/10-user-dirs-update-mate @@ -0,0 +1,10 @@ +#!/bin/sh + +# Create various XDG directories, and write ~/.config/user-dirs.dirs, etc. +# That file is read by glib to get XDG_PICTURES_DIR, etc + +if [ "$DESKTOP_SESSION" = "mate" ]; then + if type xdg-user-dirs-update >/dev/null 2>&1; then + xdg-user-dirs-update + fi +fi diff --git a/mate-base/mate-session-manager/files/15-xdg-data-mate b/mate-base/mate-session-manager/files/15-xdg-data-mate new file mode 100644 index 00000000..df360cf8 --- /dev/null +++ b/mate-base/mate-session-manager/files/15-xdg-data-mate @@ -0,0 +1,9 @@ +#!/bin/sh + +if [ "$DESKTOP_SESSION" = "mate" ]; then + if [ -z "$XDG_DATA_DIRS" ]; then + export XDG_DATA_DIRS=/usr/share/mate:/usr/local/share/:/usr/share/ + else + export XDG_DATA_DIRS=/usr/share/mate:"$XDG_DATA_DIRS" + fi +fi diff --git a/mate-base/mate-session-manager/files/MATE b/mate-base/mate-session-manager/files/MATE new file mode 100644 index 00000000..baa154bd --- /dev/null +++ b/mate-base/mate-session-manager/files/MATE @@ -0,0 +1,109 @@ +#!/bin/sh +# +# This file has bitrotted badly. Someone needs to clean this up. +# + +if [ -f /etc/xdg/menus/mate-applications.menu ] ; then + export XDG_MENU_PREFIX=mate- +fi + +for errfile in "$HOME/.materc-errors" "${TMPDIR-/tmp}/materc-$USER/tmp/materc-$USER" +do + if ( cp /dev/null "$errfile" 2> /dev/null ) + then + chmod 600 "$errfile" + exec > "$errfile" 2>&1 + break + fi +done +# +# Distributors: +# You should modify the paths here to fit your distro +# If you need to do so, send me (jirka@5z.com) a patch +# and I'll try to make the script detect the distro stuff +# + +userresources=$HOME/.Xresources +usermodmap=$HOME/.Xmodmap +userxkbmap=$HOME/.Xkbmap + +sysresources=/etc/X11/Xresources +sysmodmap=/etc/X11/Xmodmap +sysxkbmap=/etc/X11/Xkbmap + +rh6sysresources=/etc/X11/xinit/Xresources +rh6sysmodmap=/etc/X11/xinit/Xmodmap + +if [ -x "$HOME/.materc" ]; then + command="$HOME/.materc" +elif [ -x /etc/X11/gdm/materc ]; then + command="/etc/X11/gdm/materc" +else + # as fallback in case the config is screwed + command=`which mate-session` +fi + +# merge in defaults +if [ -f "$rh6sysresources" ]; then + xrdb -merge "$rh6sysresources" +fi + +if [ -f "$sysresources" ]; then + xrdb -merge "$sysresources" +fi + +if [ -f "$userresources" ]; then + xrdb -merge "$userresources" +fi + +# merge in keymaps +if [ -f "$sysxkbmap" ]; then + setxkbmap `cat "$sysxkbmap"` + XKB_IN_USE=yes +fi + +if [ -f "$userxkbmap" ]; then + setxkbmap `cat "$userxkbmap"` + XKB_IN_USE=yes +fi + +# +# Eeek, this seems like too much magic here +# +if [ -z "$XKB_IN_USE" ] && [ ! -L /etc/X11/X ]; then + if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then + xkbsymbols=`sed -n -e 's/^[ ]*XkbSymbols[ ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config` + if [ -n "$xkbsymbols" ]; then + setxkbmap -symbols "$xkbsymbols" + XKB_IN_USE=yes + fi + fi +fi + +# xkb and xmodmap don't play nice together +if [ -z "$XKB_IN_USE" ]; then + if [ -f "$rh6sysmodmap" ]; then + xmodmap "$rh6sysmodmap" + fi + + if [ -f "$sysmodmap" ]; then + xmodmap "$sysmodmap" + fi + + if [ -f "$usermodmap" ]; then + xmodmap "$usermodmap" + fi +fi + +unset XKB_IN_USE + +# run all system xinitrc shell scripts. +if [ -d /etc/X11/xinit/xinitrc.d ]; then + for i in /etc/X11/xinit/xinitrc.d/* ; do + if [ -x "$i" ]; then + . "$i" + fi + done +fi + +exec $command diff --git a/mate-base/mate-session-manager/files/defaults.list b/mate-base/mate-session-manager/files/defaults.list new file mode 100644 index 00000000..0d6d6bf9 --- /dev/null +++ b/mate-base/mate-session-manager/files/defaults.list @@ -0,0 +1,336 @@ +[Default Applications] +application/rtf=abiword.desktop +application/x-abiword=abiword.desktop +text/abiword=abiword.desktop +text/richtext=abiword.desktop +text/rtf=abiword.desktop +text/x-abiword=abiword.desktop +text/x-xml-abiword=abiword.desktop +x-content/blank-bd=brasero-caja.desktop +x-content/blank-dvd=brasero-caja.desktop +x-content/blank-cd=brasero-caja.desktop +x-content/blank-hddvd=brasero-caja.desktop +application/x-dia-diagram=dia.desktop +image/bmp=eom.desktop +image/gif=eom.desktop +image/jpeg=eom.desktop +image/jpg=eom.desktop +image/pjpeg=eom.desktop +image/png=eom.desktop +image/svg+xml=eom.desktop +image/svg+xml-compressed=eom.desktop +image/x-bmp=eom.desktop +image/x-gray=eom.desktop +image/x-icb=eom.desktop +image/x-ico=eom.desktop +image/x-pcx=eom.desktop +image/x-png=eom.desktop +image/x-portable-anymap=eom.desktop +image/x-portable-bitmap=eom.desktop +image/x-portable-graymap=eom.desktop +image/x-portable-pixmap=eom.desktop +image/x-xbitmap=eom.desktop +image/x-xpixmap=eom.desktop +image/vnd.wap.wbmp=eom.desktop +image/g3fax=gimp.desktop +image/x-compressed-xcf=gimp.desktop +image/x-fits=gimp.desktop +image/x-icon=gimp.desktop +image/x-psd=gimp.desktop +image/x-sgi=gimp.desktop +image/x-sun-raster=gimp.desktop +image/x-tga=gimp.desktop +image/x-xcf=gimp.desktop +image/x-xwindowdump=gimp.desktop +application/xhtml+xml=firefox.desktop;firefox-3.6.desktop;epiphany.desktop +text/html=firefox.desktop;firefox-3.6.desktop;epiphany.desktop +application/pdf=atril.desktop +application/x-bzpdf=atril.desktop +application/x-gzpdf=atril.desktop +application/postscript=atril.desktop +application/x-bzpostscript=atril.desktop +application/x-gzpostscript=atril.desktop +image/x-eps=atril.desktop +image/x-bzeps=atril.desktop +image/x-gzeps=atril.desktop +application/x-dvi=atril.desktop +application/x-bzdvi=atril.desktop +application/x-gzdvi=atril.desktop +image/vnd.djvu=atril.desktop +image/tiff=atril.desktop +application/x-cbr=atril.desktop +application/x-cbz=atril.desktop +application/x-cb7=atril.desktop +application/x-7z-compressed=engrampa.desktop +application/x-7z-compressed-tar=engrampa.desktop +application/x-ace=engrampa.desktop +application/x-alz=engrampa.desktop +application/x-ar=engrampa.desktop +application/x-arj=engrampa.desktop +application/x-bzip=engrampa.desktop +application/x-bzip-compressed-tar=engrampa.desktop +application/x-bzip1=engrampa.desktop +application/x-bzip1-compressed-tar=engrampa.desktop +application/x-cabinet=engrampa.desktop +application/x-cd-image=engrampa.desktop +application/x-compress=engrampa.desktop +application/x-compressed-tar=engrampa.desktop +application/x-cpio=engrampa.desktop +application/x-deb=engrampa.desktop +application/x-ear=engrampa.desktop +application/x-gtar=engrampa.desktop +application/x-gzip=engrampa.desktop +application/x-java-archive=engrampa.desktop +application/x-lha=engrampa.desktop +application/x-lhz=engrampa.desktop +application/x-lzip=engrampa.desktop +application/x-lzip-compressed-tar=engrampa.desktop +application/x-lzma=engrampa.desktop +application/x-lzma-compressed-tar=engrampa.desktop +application/x-lzop=engrampa.desktop +application/x-lzop-compressed-tar=engrampa.desktop +application/x-rar=engrampa.desktop +application/x-rar-compressed=engrampa.desktop +application/x-rpm=engrampa.desktop +application/x-rzip=engrampa.desktop +application/x-tar=engrampa.desktop +application/x-tarz=engrampa.desktop +application/x-stuffit=engrampa.desktop +application/x-war=engrampa.desktop +application/x-xz=engrampa.desktop +application/x-xz-compressed-tar=engrampa.desktop +application/x-zip=engrampa.desktop +application/x-zip-compressed=engrampa.desktop +application/x-zoo=engrampa.desktop +application/zip=engrampa.desktop +multipart/x-zip=engrampa.desktop +text/plain=pluma.desktop +text/css=pluma.desktop +text/javascript=pluma.desktop +text/mathml=pluma.desktop +text/x-csrc=pluma.desktop +text/x-chdr=pluma.desktop +text/x-dtd=pluma.desktop +text/x-java=pluma.desktop +text/x-javascript=pluma.desktop +text/x-patch=pluma.desktop +text/x-perl=pluma.destkop +text/x-php=pluma.destkop +text/x-python=pluma.destkop +text/x-sql=pluma.desktop +text/xml=pluma.desktop +application/javascript=pluma.destkop +application/x-cgi=pluma.desktop +application/x-javascript=pluma.desktop +application/x-perl=pluma.desktop +application/x-php=pluma.desktop +application/x-python=pluma.desktop +application/xml=pluma.desktop +application/xml-dtd=pluma.desktop +application/x-font-ttf=mate-font-viewer.desktop +application/x-font-pcf=mate-font-viewer.desktop +application/x-font-type1=mate-font-viewer.desktop +application/x-font-otf=mate-font-viewer.desktop +application/csv=gnumeric.desktop +application/excel=gnumeric.desktop +application/msexcel=gnumeric.desktop +application/tab-separated-values=gnumeric.desktop +application/vnd.lotus-1-2-3=gnumeric.desktop +application/vnd.ms-excel=gnumeric.desktop +application/x-123=gnumeric.desktop +application/x-applix-spreadsheet=gnumeric.desktop +application/x-dbase=gnumeric.desktop +application/x-dbf=gnumeric.desktop +application/x-dos_ms_excel=gnumeric.desktop +application/x-excel=gnumeric.desktop +application/x-gnumeric=gnumeric.desktop +application/x-mps=gnumeric.desktop +application/x-ms-excel=gnumeric.desktop +application/x-msexcel=gnumeric.desktop +application/x-oleo=gnumeric.desktop +application/x-planperfect=gnumeric.desktop +application/x-quattropro=gnumeric.desktop +application/x-sc=gnumeric.desktop +application/x-sylk=gnumeric.desktop +application/x-xbase=gnumeric.desktop +application/x-xls=gnumeric.desktop +application/xls=gnumeric.desktop +text/comma-separated-values=gnumeric.desktop +text/csv=gnumeric.desktop +text/spreadsheet=gnumeric.desktop +text/tab-separated-values=gnumeric.desktop +text/x-comma-separated-values=gnumeric.desktop +text/x-csv=gnumeric.desktop +zz-application/zz-winassoc-xls=gnumeric.desktop +x-content/software=caja-autorun-software.desktop +x-directory/gnome-default-handler=caja-folder-handler.desktop +x-directory/normal=caja-folder-handler.desktop +inode/directory=caja-folder-handler.desktop +application/x-gnome-saved-search=caja-folder-handler.desktop +application/vnd.oasis.opendocument.spreadsheet=libreoffice-calc.desktop;openoffice.org-calc.desktop +application/vnd.oasis.opendocument.spreadsheet-template=libreoffice-calc.desktop;openoffice.org-calc.desktop +application/vnd.sun.xml.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop +application/vnd.sun.xml.calc.template=libreoffice-calc.desktop;openoffice.org-calc.desktop +application/vnd.stardivision.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop +application/vnd.stardivision.chart=libreoffice-calc.desktop;openoffice.org-calc.desktop +application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=libreoffice-calc.desktop;openoffice.org-calc.desktop +application/vnd.ms-excel.sheet.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop +application/vnd.openxmlformats-officedocument.spreadsheetml.template=libreoffice-calc.desktop;openoffice.org-calc.desktop +application/vnd.ms-excel.template.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop +application/vnd.ms-excel.sheet.binary.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop +application/vnd.oasis.opendocument.graphics=libreoffice-draw.desktop;openoffice.org-draw.desktop +application/vnd.oasis.opendocument.graphics-template=libreoffice-draw.desktop;openoffice.org-draw.desktop +application/vnd.sun.xml.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop +application/vnd.sun.xml.draw.template=libreoffice-draw.desktop;openoffice.org-draw.desktop +application/vnd.stardivision.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop +application/vnd.oasis.opendocument.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop +application/vnd.oasis.opendocument.presentation-template=libreoffice-impress.desktop;openoffice.org-impress.desktop +application/vnd.sun.xml.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop +application/vnd.sun.xml.impress.template=libreoffice-impress.desktop;openoffice.org-impress.desktop +application/vnd.stardivision.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop +application/mspowerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop +application/vnd.ms-powerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop +application/vnd.openxmlformats-officedocument.presentationml.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop +application/vnd.ms-powerpoint.presentation.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop +application/vnd.openxmlformats-officedocument.presentationml.template=libreoffice-impress.desktop;openoffice.org-impress.desktop +application/vnd.ms-powerpoint.template.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop +application/vnd.oasis.opendocument.formula=libreoffice-math.desktop;openoffice.org-math.desktop +application/vnd.sun.xml.math=libreoffice-math.desktop;openoffice.org-math.desktop +application/vnd.stardivision.math=libreoffice-math.desktop;openoffice.org-math.desktop +application/vnd.oasis.opendocument.text=libreoffice-writer.desktop;openoffice.org-writer.desktop +application/vnd.oasis.opendocument.text-template=libreoffice-writer.desktop;openoffice.org-writer.desktop +application/vnd.oasis.opendocument.text-web=libreoffice-writer.desktop;openoffice.org-writer.desktop +application/vnd.oasis.opendocument.text-master=libreoffice-writer.desktop;openoffice.org-writer.desktop +application/vnd.sun.xml.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop +application/vnd.sun.xml.writer.template=libreoffice-writer.desktop;openoffice.org-writer.desktop +application/vnd.sun.xml.writer.global=libreoffice-writer.desktop;openoffice.org-writer.desktop +application/vnd.stardivision.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop +application/msword=libreoffice-writer.desktop;openoffice.org-writer.desktop +application/vnd.ms-word=libreoffice-writer.desktop;openoffice.org-writer.desktop +application/x-doc=libreoffice-writer.desktop;openoffice.org-writer.desktop +application/vnd.wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop +application/wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop +application/vnd.openxmlformats-officedocument.wordprocessingml.document=libreoffice-writer.desktop;openoffice.org-writer.desktop +application/vnd.ms-word.document.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop +application/vnd.openxmlformats-officedocument.wordprocessingml.template=libreoffice-writer.desktop;openoffice.org-writer.desktop +application/vnd.ms-word.template.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop +x-content/audio-player=rhythmbox.desktop +x-content/audio-cdda=sound-juicer.desktop +application/x-shockwave-flash=swfdec-player.desktop +application/futuresplash=swfdec-player.desktop +application/mxf=vlc.desktop +application/ogg=vlc.desktop +application/ram=vlc.desktop +application/sdp=vlc.desktop +application/smil=vlc.desktop +application/smil+xml=vlc.desktop +application/vnd.ms-wpl=vlc.desktop +application/vnd.rn-realmedia=vlc.desktop +application/x-extension-m4a=vlc.desktop +application/x-extension-mp4=vlc.desktop +application/x-flac=vlc.desktop +application/x-flash-video=vlc.desktop +application/x-lyx=lyx.desktop +application/x-matroska=vlc.desktop +application/x-netshow-channel=vlc.desktop +application/x-ogg=vlc.desktop +application/x-quicktime-media-link=vlc.desktop +application/x-quicktimeplayer=vlc.desktop +application/x-shorten=vlc.desktop +application/x-smil=vlc.desktop +application/xspf+xml=vlc.desktop +audio/3gpp=vlc.desktop +audio/ac3=vlc.desktop +audio/AMR=vlc.desktop +audio/AMR-WB=vlc.desktop +audio/basic=vlc.desktop +audio/midi=vlc.desktop +audio/mp4=vlc.desktop +audio/mpeg=vlc.desktop +audio/mpegurl=vlc.desktop +audio/ogg=vlc.desktop +audio/prs.sid=vlc.desktop +audio/vnd.rn-realaudio=vlc.desktop +audio/x-ape=vlc.desktop +audio/x-flac=vlc.desktop +audio/x-gsm=vlc.desktop +audio/x-it=vlc.desktop +audio/x-m4a=vlc.desktop +audio/x-matroska=vlc.desktop +audio/x-mod=vlc.desktop +audio/x-mp3=vlc.desktop +audio/x-mpeg=vlc.desktop +audio/x-mpegurl=vlc.desktop +audio/x-ms-asf=vlc.desktop +audio/x-ms-asx=vlc.desktop +audio/x-ms-wax=vlc.desktop +audio/x-ms-wma=vlc.desktop +audio/x-musepack=vlc.desktop +audio/x-pn-aiff=vlc.desktop +audio/x-pn-au=vlc.desktop +audio/x-pn-realaudio=vlc.desktop +audio/x-pn-realaudio-plugin=vlc.desktop +audio/x-pn-wav=vlc.desktop +audio/x-pn-windows-acm=vlc.desktop +audio/x-realaudio=vlc.desktop +audio/x-real-audio=vlc.desktop +audio/x-sbc=vlc.desktop +audio/x-scpls=vlc.desktop +audio/x-speex=vlc.desktop +audio/x-tta=vlc.desktop +audio/x-vorbis=audacious.desktop +audio/x-vorbis+ogg=audacious.desktop +audio/x-wav=audacious.desktop +audio/x-wavpack=audacious.desktop +audio/x-xm=audacious.desktop +image/vnd.rn-realpix=vlc.desktop +image/x-pict=vlc.desktop +misc/ultravox=vlc.desktop +text/google-video-pointer=vlc.desktop +text/x-google-video-pointer=vlc.desktop +video/3gpp=vlc.desktop +video/dv=vlc.desktop +video/fli=vlc.desktop +video/flv=vlc.desktop +video/mp2t=vlc.desktop +video/mp4=vlc.desktop +video/mp4v-es=vlc.desktop +video/mpeg=vlc.desktop +video/msvideo=vlc.desktop +video/ogg=vlc.desktop +video/quicktime=vlc.desktop +video/vivo=vlc.desktop +video/vnd.divx=vlc.desktop +video/vnd.rn-realvideo=vlc.desktop +video/vnd.vivo=vlc.desktop +video/webm=vlc.desktop +video/x-anim=vlc.desktop +video/x-avi=vlc.desktop +video/x-flc=vlc.desktop +video/x-fli=vlc.desktop +video/x-flic=vlc.desktop +video/x-flv=vlc.desktop +video/x-m4v=vlc.desktop +video/x-matroska=vlc.desktop +video/x-mpeg=vlc.desktop +video/x-ms-asf=vlc.desktop +video/x-ms-asx=vlc.desktop +video/x-msvideo=vlc.desktop +video/x-ms-wm=vlc.desktop +video/x-ms-wmv=vlc.desktop +video/x-ms-wmx=vlc.desktop +video/x-ms-wvx=vlc.desktop +video/x-nsv=vlc.desktop +video/x-ogm+ogg=vlc.desktop +video/x-theora+ogg=vlc.desktop +video/x-totem-stream=vlc.desktop +x-content/video-dvd=vlc.desktop +x-content/video-vcd=vlc.desktop +x-content/video-svcd=vlc.desktop +x-scheme-handler/ghelp=yelp.desktop; +x-scheme-handler/help=yelp.desktop; +x-scheme-handler/http=firefox.desktop;epiphany.desktop +x-scheme-handler/https=firefox.desktop;epiphany.desktop +x-scheme-handler/mailto=evolution.desktop +application/x-bittorrent=transmission-gtk.desktop;deluge.desktop +x-scheme-handler/magnet=transmission-gtk.desktop;deluge.desktop diff --git a/mate-base/mate-session-manager/files/mate-session-manager-1.2.0-idle-transition.patch b/mate-base/mate-session-manager/files/mate-session-manager-1.2.0-idle-transition.patch new file mode 100644 index 00000000..62a229e5 --- /dev/null +++ b/mate-base/mate-session-manager/files/mate-session-manager-1.2.0-idle-transition.patch @@ -0,0 +1,10 @@ +--- a/mate-session/gs-idle-monitor.c 2012-02-29 22:03:08.000000000 +0100 ++++ b/mate-session/gs-idle-monitor.c 2012-08-08 11:49:13.308281663 +0200 +@@ -448,6 +448,7 @@ + attr.delta = delta; + attr.events = TRUE; + ++ attr.trigger.wait_value = _int64_to_xsyncvalue (_xsyncvalue_to_int64 (watch->interval) - 1); + attr.trigger.test_type = XSyncPositiveTransition; + if (watch->xalarm_positive != None) { + g_debug ("GSIdleMonitor: updating alarm for positive transition wait=%lld", diff --git a/mate-base/mate-session-manager/files/mate-session-manager-1.5.2-save-session-ui.patch b/mate-base/mate-session-manager/files/mate-session-manager-1.5.2-save-session-ui.patch new file mode 100644 index 00000000..8a57d44a --- /dev/null +++ b/mate-base/mate-session-manager/files/mate-session-manager-1.5.2-save-session-ui.patch @@ -0,0 +1,535 @@ +diff -burN a/capplet/gsm-properties-dialog.c b/capplet/gsm-properties-dialog.c +--- a/capplet/gsm-properties-dialog.c 2012-02-29 22:03:08.000000000 +0100 ++++ b/capplet/gsm-properties-dialog.c 2012-08-08 12:16:37.527332034 +0200 +@@ -26,6 +26,8 @@ + #include <glib.h> + #include <glib/gi18n.h> + #include <gtk/gtk.h> ++#include <dbus/dbus-glib.h> ++#include <dbus/dbus-glib-lowlevel.h> + + #include <mateconf/mateconf-client.h> + +@@ -36,6 +38,11 @@ + #include "gsp-app.h" + #include "gsp-app-manager.h" + ++ ++#define GSM_SERVICE_DBUS "org.mate.SessionManager" ++#define GSM_PATH_DBUS "/org/mate/SessionManager" ++#define GSM_INTERFACE_DBUS "org.mate.SessionManager" ++ + #define GSM_PROPERTIES_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_PROPERTIES_DIALOG, GsmPropertiesDialogPrivate)) + + #define IS_STRING_EMPTY(x) ((x)==NULL||(x)[0]=='\0') +@@ -50,6 +57,7 @@ + #define CAPPLET_DELETE_WIDGET_NAME "session_properties_delete_button" + #define CAPPLET_EDIT_WIDGET_NAME "session_properties_edit_button" + #define CAPPLET_SAVE_WIDGET_NAME "session_properties_save_button" ++#define CAPPLET_SESSION_SAVED_WIDGET_NAME "session_properties_session_saved_label" + #define CAPPLET_REMEMBER_WIDGET_NAME "session_properties_remember_toggle" + + #define STARTUP_APP_ICON "system-run" +@@ -493,10 +501,66 @@ + } + + static void ++session_saved_message (GsmPropertiesDialog *dialog, ++ const char *msg, ++ gboolean is_error) ++{ ++ GtkLabel *label; ++ gchar *markup; ++ ++ label = GTK_LABEL (gtk_builder_get_object (dialog->priv->xml, CAPPLET_SESSION_SAVED_WIDGET_NAME)); ++ if (is_error) ++ markup = g_markup_printf_escaped ("<span foreground=\"red\">%s</span>", msg); ++ else ++ markup = g_markup_escape_text (msg, -1); ++ ++ gtk_label_set_markup (label, markup); ++ g_free (markup); ++} ++ ++static void ++session_saved_cb (DBusGProxy *proxy, ++ DBusGProxyCall *call_id, ++ void *user_data) ++{ ++ gboolean res; ++ GsmPropertiesDialog *dialog = user_data; ++ ++ res = dbus_g_proxy_end_call (proxy, call_id, NULL, G_TYPE_INVALID); ++ if (res) ++ session_saved_message (dialog, _("Your session has been saved."), FALSE); ++ else ++ session_saved_message (dialog, _("Failed to save session"), TRUE); ++ ++ g_object_unref (proxy); ++} ++ ++static void + on_save_session_clicked (GtkWidget *widget, + GsmPropertiesDialog *dialog) + { +- g_debug ("Session saving is not implemented yet!"); ++ DBusGConnection *conn; ++ DBusGProxy *proxy; ++ DBusGProxyCall *call; ++ ++ conn = dbus_g_bus_get (DBUS_BUS_SESSION, NULL); ++ if (conn == NULL) { ++ session_saved_message (dialog, _("Could not connect to the session bus"), TRUE); ++ return; ++ } ++ ++ proxy = dbus_g_proxy_new_for_name (conn, GSM_SERVICE_DBUS, GSM_PATH_DBUS, GSM_INTERFACE_DBUS); ++ if (proxy == NULL) { ++ session_saved_message (dialog, _("Could not connect to the session manager"), TRUE); ++ return; ++ } ++ ++ call = dbus_g_proxy_begin_call (proxy, "SaveSession", session_saved_cb, dialog, NULL, G_TYPE_INVALID); ++ if (call == NULL) { ++ session_saved_message (dialog, _("Failed to save session"), TRUE); ++ g_object_unref (proxy); ++ return; ++ } + } + + static void +diff -burN a/configure.ac b/configure.ac +--- a/configure.ac 2012-02-29 22:03:09.000000000 +0100 ++++ b/configure.ac 2012-08-08 12:18:58.740336360 +0200 +@@ -75,6 +75,7 @@ + PKG_CHECK_MODULES(SESSION_PROPERTIES, + glib-2.0 >= $GLIB_REQUIRED + gtk+-$GTK_API_VERSION >= $GTK_REQUIRED ++ dbus-glib-1 >= $DBUS_GLIB_REQUIRED + ) + + PKG_CHECK_MODULES(SM, sm) +diff -burN a/data/session-properties.ui b/data/session-properties.ui +--- a/data/session-properties.ui 2012-02-29 22:03:08.000000000 +0100 ++++ b/data/session-properties.ui 2012-08-08 12:22:36.619343035 +0200 +@@ -148,6 +148,7 @@ + <property name="visible">True</property> + <child> + <object class="GtkButton" id="session_properties_save_button"> ++ <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <child> +@@ -191,6 +192,17 @@ + <property name="position">1</property> + </packing> + </child> ++ <child> ++ <object class="GtkLabel" id="session_properties_session_saved_label"> ++ <property name="visible">True</property> ++ <property name="wrap">True</property> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="fill">False</property> ++ <property name="position">2</property> ++ </packing> ++ </child> + </object> + <packing> + <property name="position">1</property> +diff -burN a/mate-session/gsm-client.c b/mate-session/gsm-client.c +--- a/mate-session/gsm-client.c 2012-02-29 22:03:08.000000000 +0100 ++++ b/mate-session/gsm-client.c 2012-08-08 12:24:20.120346205 +0200 +@@ -510,6 +510,17 @@ + g_signal_emit (client, signals[DISCONNECTED], 0); + } + ++gboolean ++gsm_client_request_save (GsmClient *client, ++ guint flags, ++ GError **error) ++{ ++ g_return_val_if_fail (GSM_IS_CLIENT (client), FALSE); ++ ++ return GSM_CLIENT_GET_CLASS (client)->impl_request_save (client, flags, error); ++} ++ ++ + GKeyFile * + gsm_client_save (GsmClient *client, + GError **error) +diff -burN a/mate-session/gsm-client.h b/mate-session/gsm-client.h +--- a/mate-session/gsm-client.h 2012-02-29 22:03:09.000000000 +0100 ++++ b/mate-session/gsm-client.h 2012-08-08 12:26:38.848350455 +0200 +@@ -94,6 +94,9 @@ + GError **error); + gboolean (*impl_stop) (GsmClient *client, + GError **error); ++ gboolean (*impl_request_save) (GsmClient *client, ++ guint flags, ++ GError **error); + GKeyFile * (*impl_save) (GsmClient *client, + GError **error); + }; +@@ -139,6 +142,10 @@ + + void gsm_client_disconnected (GsmClient *client); + ++gboolean gsm_client_request_save (GsmClient *client, ++ guint flags, ++ GError **error); ++ + GKeyFile *gsm_client_save (GsmClient *client, + GError **error); + /* exported to bus */ +diff -burN a/mate-session/gsm-dbus-client.c b/mate-session/gsm-dbus-client.c +--- a/mate-session/gsm-dbus-client.c 2012-02-29 22:03:08.000000000 +0100 ++++ b/mate-session/gsm-dbus-client.c 2012-08-08 12:38:15.393371794 +0200 +@@ -413,6 +413,19 @@ + G_OBJECT_CLASS (gsm_dbus_client_parent_class)->finalize (object); + } + ++static gboolean ++dbus_client_request_save (GsmClient *client, ++ guint flags, ++ GError **error) ++{ ++ g_debug ("GsmDBusClient: sending save request to client with id %s", ++ gsm_client_peek_id (client)); ++ ++ /* FIXME: The protocol does not support this */ ++ ++ return FALSE; ++} ++ + static GKeyFile * + dbus_client_save (GsmClient *client, + GError **error) +@@ -665,6 +678,7 @@ + object_class->set_property = gsm_dbus_client_set_property; + object_class->dispose = gsm_dbus_client_dispose; + ++ client_class->impl_request_save = dbus_client_request_save; + client_class->impl_save = dbus_client_save; + client_class->impl_stop = dbus_client_stop; + client_class->impl_query_end_session = dbus_client_query_end_session; +diff -burN a/mate-session/gsm-manager.c b/mate-session/gsm-manager.c +--- a/mate-session/gsm-manager.c 2012-02-29 22:03:09.000000000 +0100 ++++ b/mate-session/gsm-manager.c 2012-08-08 12:47:24.627388620 +0200 +@@ -68,6 +68,7 @@ + #define GSM_MANAGER_DBUS_NAME "org.mate.SessionManager" + + #define GSM_MANAGER_PHASE_TIMEOUT 30 /* seconds */ ++#define GSM_MANAGER_SAVE_SESSION_TIMEOUT 2 + + #define MDM_FLEXISERVER_COMMAND "mdmflexiserver" + #define MDM_FLEXISERVER_ARGS "--startnew Standard" +@@ -1176,6 +1177,69 @@ + + } + ++static gboolean ++_client_request_save (GsmClient *client, ++ ClientEndSessionData *data) ++{ ++ gboolean ret; ++ GError *error; ++ ++ error = NULL; ++ ret = gsm_client_request_save (client, data->flags, &error); ++ if (ret) { ++ g_debug ("GsmManager: adding client to query clients: %s", gsm_client_peek_id (client)); ++ data->manager->priv->query_clients = g_slist_prepend (data->manager->priv->query_clients, ++ client); ++ } else if (error) { ++ g_debug ("GsmManager: unable to query client: %s", error->message); ++ g_error_free (error); ++ } ++ ++ return FALSE; ++} ++ ++static gboolean ++_client_request_save_helper (const char *id, ++ GsmClient *client, ++ ClientEndSessionData *data) ++{ ++ return _client_request_save (client, data); ++} ++ ++static void ++query_save_session_complete (GsmManager *manager) ++{ ++ GError *error = NULL; ++ ++ if (g_slist_length (manager->priv->next_query_clients) > 0) { ++ ClientEndSessionData data; ++ ++ data.manager = manager; ++ data.flags = GSM_CLIENT_END_SESSION_FLAG_LAST; ++ ++ g_slist_foreach (manager->priv->next_query_clients, ++ (GFunc)_client_request_save, ++ &data); ++ ++ g_slist_free (manager->priv->next_query_clients); ++ manager->priv->next_query_clients = NULL; ++ ++ return; ++ } ++ ++ if (manager->priv->query_timeout_id > 0) { ++ g_source_remove (manager->priv->query_timeout_id); ++ manager->priv->query_timeout_id = 0; ++ } ++ ++ gsm_session_save (manager->priv->clients, &error); ++ ++ if (error) { ++ g_warning ("Error saving session: %s", error->message); ++ g_error_free (error); ++ } ++} ++ + static guint32 + generate_cookie (void) + { +@@ -1250,6 +1314,21 @@ + return FALSE; + } + ++static gboolean ++_on_query_save_session_timeout (GsmManager *manager) ++{ ++ manager->priv->query_timeout_id = 0; ++ ++ g_debug ("GsmManager: query to save session timed out"); ++ ++ g_slist_free (manager->priv->query_clients); ++ manager->priv->query_clients = NULL; ++ ++ query_save_session_complete (manager); ++ ++ return FALSE; ++} ++ + static void + do_phase_query_end_session (GsmManager *manager) + { +@@ -1886,13 +1965,32 @@ + const char *reason, + GsmManager *manager) + { +- /* just ignore if received outside of shutdown */ +- if (manager->priv->phase < GSM_MANAGER_PHASE_QUERY_END_SESSION) { ++ /* just ignore if we are not yet running */ ++ if (manager->priv->phase < GSM_MANAGER_PHASE_RUNNING) { + return; + } + + g_debug ("GsmManager: Response from end session request: is-ok=%d do-last=%d cancel=%d reason=%s", is_ok, do_last, cancel, reason ? reason :""); + ++ if (manager->priv->phase == GSM_MANAGER_PHASE_RUNNING) { ++ /* Ignore responses when no requests were sent */ ++ if (manager->priv->query_clients == NULL) { ++ return; ++ } ++ ++ manager->priv->query_clients = g_slist_remove (manager->priv->query_clients, client); ++ ++ if (do_last) { ++ manager->priv->next_query_clients = g_slist_prepend (manager->priv->next_query_clients, ++ client); ++ } ++ ++ if (manager->priv->query_clients == NULL) { ++ query_save_session_complete (manager); ++ } ++ return; ++ } ++ + if (cancel) { + cancel_end_session (manager); + return; +@@ -1991,6 +2089,15 @@ + } + + static void ++on_xsmp_client_save_request (GsmXSMPClient *client, ++ gboolean show_dialog, ++ GsmManager *manager) ++{ ++ g_debug ("GsmManager: save_request"); ++ gsm_manager_save_session (manager, NULL); ++} ++ ++static void + on_store_client_added (GsmStore *store, + const char *id, + GsmManager *manager) +@@ -2011,6 +2118,10 @@ + "logout-request", + G_CALLBACK (on_xsmp_client_logout_request), + manager); ++ g_signal_connect (client, ++ "save-request", ++ G_CALLBACK (on_xsmp_client_save_request), ++ manager); + } + + g_signal_connect (client, +@@ -2968,6 +3079,41 @@ + } + + gboolean ++gsm_manager_save_session (GsmManager *manager, ++ GError **error) ++{ ++ ClientEndSessionData data; ++ ++ g_debug ("GsmManager: SaveSession called"); ++ ++ g_return_val_if_fail (GSM_IS_MANAGER (manager), FALSE); ++ ++ if (manager->priv->phase != GSM_MANAGER_PHASE_RUNNING) { ++ g_set_error (error, ++ GSM_MANAGER_ERROR, ++ GSM_MANAGER_ERROR_NOT_IN_RUNNING, ++ "SaveSession interface is only available during the Running phase"); ++ return FALSE; ++ } ++ ++ data.manager = manager; ++ data.flags = 0; ++ gsm_store_foreach (manager->priv->clients, ++ (GsmStoreFunc)_client_request_save_helper, ++ &data); ++ ++ if (manager->priv->query_clients) { ++ manager->priv->query_timeout_id = g_timeout_add_seconds (GSM_MANAGER_SAVE_SESSION_TIMEOUT, ++ (GSourceFunc)_on_query_save_session_timeout, ++ manager); ++ return TRUE; ++ } else { ++ g_debug ("GsmManager: Nothing to save"); ++ return FALSE; ++ } ++} ++ ++gboolean + gsm_manager_can_shutdown (GsmManager *manager, + gboolean *shutdown_available, + GError **error) +diff -burN a/mate-session/gsm-manager.h b/mate-session/gsm-manager.h +--- a/mate-session/gsm-manager.h 2012-02-29 22:03:09.000000000 +0100 ++++ b/mate-session/gsm-manager.h 2012-08-08 12:49:14.262391979 +0200 +@@ -154,6 +154,9 @@ + gboolean gsm_manager_shutdown (GsmManager *manager, + GError **error); + ++gboolean gsm_manager_save_session (GsmManager *manager, ++ GError **error); ++ + gboolean gsm_manager_can_shutdown (GsmManager *manager, + gboolean *shutdown_available, + GError **error); +diff -burN a/mate-session/gsm-xsmp-client.c b/mate-session/gsm-xsmp-client.c +--- a/mate-session/gsm-xsmp-client.c 2012-02-29 22:03:08.000000000 +0100 ++++ b/mate-session/gsm-xsmp-client.c 2012-08-08 12:52:27.719397905 +0200 +@@ -69,6 +69,7 @@ + enum { + REGISTER_REQUEST, + LOGOUT_REQUEST, ++ SAVE_REQUEST, + LAST_SIGNAL + }; + +@@ -502,6 +503,31 @@ + return TRUE; + } + ++static gboolean ++xsmp_request_save (GsmClient *client, ++ guint flags, ++ GError **error) ++{ ++ GsmXSMPClient *xsmp = (GsmXSMPClient *) client; ++ ++ g_debug ("GsmXSMPClient: xsmp_request_save ('%s')", xsmp->priv->description); ++ ++ if (xsmp->priv->conn == NULL) { ++ g_set_error (error, ++ GSM_CLIENT_ERROR, ++ GSM_CLIENT_ERROR_NOT_REGISTERED, ++ "Client is not registered"); ++ return FALSE; ++ } ++ ++ if (flags & GSM_CLIENT_END_SESSION_FLAG_LAST) ++ xsmp_save_yourself_phase2 (client); ++ else ++ do_save_yourself (xsmp, SmSaveLocal, FALSE); ++ ++ return TRUE; ++} ++ + static char * + get_desktop_file_path (GsmXSMPClient *client) + { +@@ -976,6 +1002,8 @@ + object_class->get_property = gsm_xsmp_client_get_property; + object_class->set_property = gsm_xsmp_client_set_property; + ++ ++ client_class->impl_request_save = xsmp_request_save; + client_class->impl_save = xsmp_save; + client_class->impl_stop = xsmp_stop; + client_class->impl_query_end_session = xsmp_query_end_session; +@@ -1003,6 +1031,16 @@ + NULL, + NULL, + g_cclosure_marshal_VOID__BOOLEAN, ++ G_TYPE_NONE, ++ 1, G_TYPE_BOOLEAN); ++ signals[SAVE_REQUEST] = ++ g_signal_new ("save-request", ++ G_OBJECT_CLASS_TYPE (object_class), ++ G_SIGNAL_RUN_LAST, ++ G_STRUCT_OFFSET (GsmXSMPClientClass, save_request), ++ NULL, ++ NULL, ++ g_cclosure_marshal_VOID__BOOLEAN, + G_TYPE_NONE, + 1, G_TYPE_BOOLEAN); + +diff -burN a/mate-session/gsm-xsmp-client.h b/mate-session/gsm-xsmp-client.h +--- a/mate-session/gsm-xsmp-client.h 2012-02-29 22:03:09.000000000 +0100 ++++ b/mate-session/gsm-xsmp-client.h 2012-08-08 12:53:39.629400108 +0200 +@@ -57,6 +57,8 @@ + gboolean (*logout_request) (GsmXSMPClient *client, + gboolean prompt); + ++ gboolean (*save_request) (GsmXSMPClient *client, ++ gboolean prompt); + + void (*saved_state) (GsmXSMPClient *client); + +diff -burN a/mate-session/org.mate.SessionManager.xml b/mate-session/org.mate.SessionManager.xml +--- a/mate-session/org.mate.SessionManager.xml 2012-02-29 22:03:09.000000000 +0100 ++++ b/mate-session/org.mate.SessionManager.xml 2012-08-08 12:57:41.216407509 +0200 +@@ -256,6 +256,14 @@ + </doc:doc> + </method> + ++ <method name="SaveSession"> ++ <doc:doc> ++ <doc:description> ++ <doc:para>Request to save session</doc:para> ++ </doc:description> ++ </doc:doc> ++ </method> ++ + <method name="CanShutdown"> + <arg name="is_available" direction="out" type="b"> + <doc:doc> diff --git a/mate-base/mate-session-manager/files/mate-session-manager-upower1.patch b/mate-base/mate-session-manager/files/mate-session-manager-upower1.patch new file mode 100644 index 00000000..8c86a1c6 --- /dev/null +++ b/mate-base/mate-session-manager/files/mate-session-manager-upower1.patch @@ -0,0 +1,86 @@ +From 80be90bb422ef8cb5a28c7ff3fe2a337dce8c368 Mon Sep 17 00:00:00 2001 +From: Stefano Karapetsas <stefano@karapetsas.com> +Date: Tue, 22 Apr 2014 16:44:37 +0000 +Subject: Allow to build with upower 0.99 + +--- +diff --git a/mate-session/gsm-logout-dialog.c b/mate-session/gsm-logout-dialog.c +index da3d651..697b70d 100644 +--- a/mate-session/gsm-logout-dialog.c ++++ b/mate-session/gsm-logout-dialog.c +@@ -211,10 +211,10 @@ gsm_logout_supports_system_suspend (GsmLogoutDialog *logout_dialog) + if (LOGIND_RUNNING()) + ret = gsm_systemd_can_suspend (logout_dialog->priv->systemd); + #endif +-#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) ++#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) && !UP_CHECK_VERSION(0, 99, 0) + else + #endif +-#ifdef HAVE_UPOWER ++#if defined(HAVE_UPOWER) && !UP_CHECK_VERSION(0, 99, 0) + ret = up_client_get_can_suspend (logout_dialog->priv->up_client); + #endif + return ret; +@@ -229,10 +229,10 @@ gsm_logout_supports_system_hibernate (GsmLogoutDialog *logout_dialog) + if (LOGIND_RUNNING()) + ret = gsm_systemd_can_hibernate (logout_dialog->priv->systemd); + #endif +-#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) ++#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) && !UP_CHECK_VERSION(0, 99, 0) + else + #endif +-#ifdef HAVE_UPOWER ++#if defined(HAVE_UPOWER) && !UP_CHECK_VERSION(0, 99, 0) + ret = up_client_get_can_hibernate (logout_dialog->priv->up_client); + #endif + return ret; +diff --git a/mate-session/gsm-manager.c b/mate-session/gsm-manager.c +index eda565b..638ef10 100644 +--- a/mate-session/gsm-manager.c ++++ b/mate-session/gsm-manager.c +@@ -1163,10 +1163,10 @@ manager_attempt_hibernate (GsmManager *manager) + gsm_systemd_attempt_hibernate (systemd); + } + #endif +-#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) ++#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) && !UP_CHECK_VERSION(0, 99, 0) + else { + #endif +-#ifdef HAVE_UPOWER ++#if defined(HAVE_UPOWER) && !UP_CHECK_VERSION(0, 99, 0) + can_hibernate = up_client_get_can_hibernate (manager->priv->up_client); + if (can_hibernate) { + +@@ -1182,7 +1182,7 @@ manager_attempt_hibernate (GsmManager *manager) + } + } + #endif +-#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) ++#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) && !UP_CHECK_VERSION(0, 99, 0) + } + #endif + } +@@ -1208,10 +1208,10 @@ manager_attempt_suspend (GsmManager *manager) + gsm_systemd_attempt_suspend (systemd); + } + #endif +-#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) ++#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) && !UP_CHECK_VERSION(0, 99, 0) + else { + #endif +-#ifdef HAVE_UPOWER ++#if defined(HAVE_UPOWER) && !UP_CHECK_VERSION(0, 99, 0) + can_suspend = up_client_get_can_suspend (manager->priv->up_client); + if (can_suspend) { + +@@ -1227,7 +1227,7 @@ manager_attempt_suspend (GsmManager *manager) + } + } + #endif +-#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) ++#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) && !UP_CHECK_VERSION(0, 99, 0) + } + #endif + } +-- +cgit |