From 8ba34a8831751b0825cabbcfc552e14e3510af2b Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Wed, 8 Mar 2017 14:08:09 -0500 Subject: [PATCH 01/19] Revert "Remove all references to gnome-session-properties" This reverts commit 0c6fe6ca14b65cdfc1cd039a5cc9cb83ea346d6b. --- configure.ac | 8 + data/Makefile.am | 5 +- data/icons/16x16/Makefile.am | 28 ++ data/icons/16x16/session-properties.png | Bin 0 -> 595 bytes data/icons/16x16/session-properties.svg | 394 ++++++++++++++++ data/icons/22x22/Makefile.am | 27 ++ data/icons/22x22/session-properties.png | Bin 0 -> 754 bytes data/icons/22x22/session-properties.svg | 440 ++++++++++++++++++ data/icons/24x24/Makefile.am | 25 + data/icons/24x24/session-properties.png | Bin 0 -> 784 bytes data/icons/32x32/Makefile.am | 27 ++ data/icons/32x32/session-properties.png | Bin 0 -> 1109 bytes data/icons/32x32/session-properties.svg | 490 ++++++++++++++++++++ data/icons/48x48/Makefile.am | 25 + data/icons/48x48/session-properties.png | Bin 0 -> 1839 bytes data/icons/Makefile.am | 3 + data/icons/scalable/Makefile.am | 25 + data/icons/scalable/session-properties.svg | 515 +++++++++++++++++++++ data/icons/symbolic/Makefile.am | 25 + .../icons/symbolic/session-properties-symbolic.svg | 28 ++ data/session-properties.ui | 323 +++++++++++++ doc/man/gnome-session.1 | 2 + po/POTFILES.in | 1 + 23 files changed, 2390 insertions(+), 1 deletion(-) create mode 100644 data/icons/16x16/Makefile.am create mode 100644 data/icons/16x16/session-properties.png create mode 100644 data/icons/16x16/session-properties.svg create mode 100644 data/icons/22x22/Makefile.am create mode 100644 data/icons/22x22/session-properties.png create mode 100644 data/icons/22x22/session-properties.svg create mode 100644 data/icons/24x24/Makefile.am create mode 100644 data/icons/24x24/session-properties.png create mode 100644 data/icons/32x32/Makefile.am create mode 100644 data/icons/32x32/session-properties.png create mode 100644 data/icons/32x32/session-properties.svg create mode 100644 data/icons/48x48/Makefile.am create mode 100644 data/icons/48x48/session-properties.png create mode 100644 data/icons/Makefile.am create mode 100644 data/icons/scalable/Makefile.am create mode 100644 data/icons/scalable/session-properties.svg create mode 100644 data/icons/symbolic/Makefile.am create mode 100644 data/icons/symbolic/session-properties-symbolic.svg create mode 100644 data/session-properties.ui diff --git a/configure.ac b/configure.ac index ec41462e..f57dcf3d 100644 --- a/configure.ac +++ b/configure.ac @@ -343,60 +343,68 @@ if test $enable_ipv6 = yes; then dnl ================================================================= dnl Now we would check for specific function like getaddrinfo. dnl ================================================================= have_getaddrinfo=no if test $have_ipv6=yes; then AC_CHECK_FUNC(getaddrinfo, have_getaddrinfo=yes) if test $have_getaddrinfo != yes; then # getaddrinfo is not in the default libraries. See if it's in some other. for lib in bsd socket inet; do AC_CHECK_LIB($lib, getaddrinfo, [LIBS="$LIBS -l$lib";have_getaddrinfo=yes; break]) done fi if test $have_getaddrinfo=yes; then AC_DEFINE(ENABLE_IPV6, 1, [Define if IPV6 is supported]) have_full_ipv6=yes fi fi fi dnl ============================================================================== dnl End of IPv6 checks dnl ============================================================================== AC_CONFIG_FILES([ Makefile doc/Makefile doc/dbus/Makefile doc/dbus/gnome-session.xml doc/man/Makefile data/Makefile data/org.gnome.SessionManager.gschema.xml +data/icons/Makefile +data/icons/16x16/Makefile +data/icons/22x22/Makefile +data/icons/24x24/Makefile +data/icons/32x32/Makefile +data/icons/48x48/Makefile +data/icons/scalable/Makefile +data/icons/symbolic/Makefile gnome-session/Makefile tools/Makefile po/Makefile.in ]) AC_OUTPUT dnl --------------------------------------------------------------------------- dnl - Show summary dnl --------------------------------------------------------------------------- echo " gnome-session $VERSION `echo gnome-session $VERSION | sed "s/./=/g"` prefix: ${prefix} exec_prefix: ${exec_prefix} libdir: ${libdir} bindir: ${bindir} sbindir: ${sbindir} sysconfdir: ${sysconfdir} localstatedir: ${localstatedir} datadir: ${datadir} source code location: ${srcdir} compiler: ${CC} cflags: ${CFLAGS} Maintainer mode: ${USE_MAINTAINER_MODE} Use *_DISABLE_DEPRECATED: ${enable_deprecation_flags} GConf support: ${enable_gconf} Session tracking: ${session_tracking} diff --git a/data/Makefile.am b/data/Makefile.am index d8c45573..413279a2 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,32 +1,35 @@ +SUBDIRS = icons + uidir = $(pkgdatadir) -ui_DATA = +ui_DATA = \ + session-properties.ui if BUILD_SESSION_SELECTOR ui_DATA += session-selector.ui endif hwcompatdir = $(pkgdatadir) hwcompat_DATA = hardware-compatibility xsessiondir = $(datadir)/xsessions xsession_in_files = gnome.desktop.in gnome-xorg.desktop.in if BUILD_SESSION_SELECTOR xsession_in_files += gnome-custom-session.desktop.in endif xsession_DATA = $(xsession_in_files:.desktop.in=.desktop) wayland_sessiondir = $(datadir)/wayland-sessions wayland_session_in_files = gnome.desktop.in wayland_session_DATA = $(wayland_session_in_files:.desktop.in=.desktop) sessiondir = $(datadir)/gnome-session/sessions session_in_in_files = gnome.session.desktop.in.in gnome-dummy.session.desktop.in.in session_in_files = $(session_in_in_files:.session.desktop.in.in=.session.desktop.in) session_DATA = $(session_in_files:.session.desktop.in=.session) %.session.desktop.in: %.session.desktop.in.in Makefile $(AM_V_GEN)sed \ -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ $< > $@ diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am new file mode 100644 index 00000000..d338f4c3 --- /dev/null +++ b/data/icons/16x16/Makefile.am @@ -0,0 +1,28 @@ +size = 16x16 + +themedir = $(datadir)/icons/hicolor +iconsdir = $(themedir)/$(size)/apps + +icons_DATA = session-properties.png +icons_SOURCE = session-properties.svg + +gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor + +install-data-hook: + @-if test -z "$(DESTDIR)"; then \ + echo "Updating Gtk icon cache."; \ + $(gtk_update_icon_cache); \ + else \ + echo "*** Icon cache not updated. After install, run this:"; \ + echo "*** $(gtk_update_icon_cache)"; \ + fi + +uninstall-hook: + @rm -f $(DESTDIR)$(themedir)/icon-theme.cache + + +EXTRA_DIST = \ + $(icons_DATA) \ + $(icons_SOURCE) + +-include $(top_srcdir)/git.mk diff --git a/data/icons/16x16/session-properties.png b/data/icons/16x16/session-properties.png new file mode 100644 index 0000000000000000000000000000000000000000..1367c20ae73a8b5e73d98f5dbcb6341cd0dc9ebe GIT binary patch literal 595 zcmV-Z0<8UsP)5liy2|Q5eTR&-=cox8c~2 zT2`*8E+SB&p~E)2@g|62&LHY4vde`2fUqAIbrnQ(5fMsI5DdE5O+<8)3nGl7Xd(&* zq1IM`>7Zrq{n5poPS>=at8;js&-a|~^PD4B?+lHE1HU`?hY%420RcqF7tApudZ4MJ zE8c~s=~abwC6-r?>+t&Bt7c<7Zxa4AL0x8@n8=B3Jba!bXKlr@-Brn-Gw*5G6{!mw zx-k6mv!wxSGPJ6c%lz0AW=9{ddwPY@08FFo-*qhJvS~b}{D#-BFh)hqDJ?Mn;Sqax z1UY%4pUYP+GX3;gE$H#$@o&f6A6pS{7YqD&bD!wJR(gAqhzK`t+(Oedlu{Umfl>;k z6vbkZ$&Zr^-W$Se?b9@IZQiD@6K)K0JlTuXpCJG~pO5yocFvyeBealJnkzc71Mt88Ig(;l`&`*@Z~@%7txx)TWoE?xL5*x>ck8IN-~-nr5P)6mg9 zK7!FRjAql!4BiEV-A4y%1ngf0M#hJkno0pnV_cr8VG@X(V$SseZVe2edwlqtk5MQt z;yTunfU0^(A_Q7`2)1_DZ-59bhmMpjh+r#S^hDdv)kSOfYppnq%x;cY66;Uhwo3Ln haR2i^x#&uN@CTAjj`{aKg8l#i002ovPDHLkV1gZB6^{S_ literal 0 HcmV?d00001 diff --git a/data/icons/16x16/session-properties.svg b/data/icons/16x16/session-properties.svg new file mode 100644 index 00000000..4f7c37f2 --- /dev/null +++ b/data/icons/16x16/session-properties.svg @@ -0,0 +1,394 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + Gnome Session Properties + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am new file mode 100644 index 00000000..ae4931c2 --- /dev/null +++ b/data/icons/22x22/Makefile.am @@ -0,0 +1,27 @@ +size = 22x22 + +themedir = $(datadir)/icons/hicolor +iconsdir = $(themedir)/$(size)/apps + +icons_DATA = session-properties.png +icons_SOURCE = session-properties.svg + +gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor + +install-data-hook: + @-if test -z "$(DESTDIR)"; then \ + echo "Updating Gtk icon cache."; \ + $(gtk_update_icon_cache); \ + else \ + echo "*** Icon cache not updated. After install, run this:"; \ + echo "*** $(gtk_update_icon_cache)"; \ + fi + +uninstall-hook: + @rm -f $(DESTDIR)$(themedir)/icon-theme.cache + +EXTRA_DIST = \ + $(icons_DATA) \ + $(icons_SOURCE) + +-include $(top_srcdir)/git.mk diff --git a/data/icons/22x22/session-properties.png b/data/icons/22x22/session-properties.png new file mode 100644 index 0000000000000000000000000000000000000000..12225ee3c2abb7f1a4be7bb77743514cde5d08fe GIT binary patch literal 754 zcmV*lgmp~Q5?rV=iJ8}9cNN| z*^7v%7U@C>t-#cZ78aG(u1!U>>3?Wdi-=qVy&!035MdZp6cK`;6=)9%L}*o1+QXS< zrhDh!x%ag2IgaI2wCD>54nNNCbAIQ0en0p}5&)+zUwyJH?$rySe=k`GKp@08Dn#(^ zvwipEi6gtkmW~@G9owqD*VWWd-ZLw?sM;o^8GQX*Z?0{SrZk|A?`$gdTK zaDO0~126$@_KpOjxkYBE3$4&W4q=!@f;D|lKLr4CGH98FJQi}5Oa^mqgu~>{)EJidMMJYuj62Y=848xeJ z7{D+L1iH`)Q^hH(Zs*Q}TLfW9+rIrAJ$4v9M}N;&M3t~^?Yf_TUfIGGi0XFkJ?vs^ zYz(b6)`qru!Jd<3_)R}Lm(2&;GX^ADxg2T^@_4WdfT}ec=LG{SSQ+D0UpJ69dHDkp zt*9bia{#F-ih=@c+|kzyj@OzrDW#WF~*C6j%({ kfc1x54{(9eiT!`39~bB4p9yeF3;+NC07*qoM6N<$f(k-YiU0rr literal 0 HcmV?d00001 diff --git a/data/icons/22x22/session-properties.svg b/data/icons/22x22/session-properties.svg new file mode 100644 index 00000000..1d0afda2 --- /dev/null +++ b/data/icons/22x22/session-properties.svg @@ -0,0 +1,440 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + Gnome Session Properties + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am new file mode 100644 index 00000000..8c28888a --- /dev/null +++ b/data/icons/24x24/Makefile.am @@ -0,0 +1,25 @@ +size = 24x24 + +themedir = $(datadir)/icons/hicolor +iconsdir = $(themedir)/$(size)/apps + +icons_DATA = session-properties.png + +gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor + +install-data-hook: + @-if test -z "$(DESTDIR)"; then \ + echo "Updating Gtk icon cache."; \ + $(gtk_update_icon_cache); \ + else \ + echo "*** Icon cache not updated. After install, run this:"; \ + echo "*** $(gtk_update_icon_cache)"; \ + fi + +uninstall-hook: + @rm -f $(DESTDIR)$(themedir)/icon-theme.cache + +EXTRA_DIST = \ + $(icons_DATA) + +-include $(top_srcdir)/git.mk diff --git a/data/icons/24x24/session-properties.png b/data/icons/24x24/session-properties.png new file mode 100644 index 0000000000000000000000000000000000000000..ac81c7ad3b604a056ed02c86bcb2db97c78f4aed GIT binary patch literal 784 zcmV+r1MmEaP)KPZr(RZ;%TnP#T<=Dm6Ew$M?>9B0Z^(18c%aCzU)J?GqWFZ}B! zvd+01w_dJ}IQ2rPKNAoF5C}0P=Og$s9(Z*2%!z|DfSs4`mR#Ob^|P+FelBy4NYVQQ z6oVh$s2$rHGyns@86wbI>11TdkWpA{ar1q6G7!&XVmBh%Gb;>V{azyFWe~bi zBtX&kYRt>V+T2Cc5DSRAjJ&vAbOxr8Bbf^b%v)3$huG^oxQUUX0fEH;ral|`u1##P zlg5T^f7An0&#i*7P!%&3;P2j#V`BrK2a2i-_1 ziAJMDA`!yjFyU~RP$-0yl3*~1X`1M|K9d1}uImU?{t_87LTODq51)47`95u}M>u)v zI7$`1LV~h{>P^*!n_RklEuyBK$ItFFIXQ_^3Ufm23ZXCU1ygSN$Jd)cYW_>H3|I*Svg!SWIe-m}PW%6@u>Ar9X6B0{qPS!L O0000jOCUOrWQ}?uexLlr3kGN|uWD_;#<|u5RK) zY+`Mgak=WxnI0e^pt9nCR9kxlwNy<@njb{gPyyI%>YIck8xnvI;QB91>{F*GDcX}0 z$O=7X^4Y)wNdc3yI{oAS4tWAH_omhWkdh{;@Y3f^@8I$|jizODC^81o)xt8D1ehy5 zUbp}NqN_AFHy6a;+uIAJ+5J2P_+$w%lN)C)4`SPPPQ*e8&b;$_&O#Gh=>i<8Y};ny z!CYPfa`jE;N*#fmGFq0!x7}~;nj{{NqbQ0iCRaGQcC3JDn(Txdzuv&MEgD~KO4`yp z=5BCuB@e@wRsqvAJ;$xvx9Gcmjg^%Zmpz{f_`E70OR0-tSr&$2WCRZ19VQgI%iAYU zp=p}SN0xJMWKJ&6Mznnd&T;3?ZAM0h>FoG``e*Ais+7+q+~GIOJc4b6LL-cgkJ8%G zj;`yht*`ULkKgn2;6Tzx2$86Wc$mq!l{y|Xk<<#-kH3~Fz^Te9V01LZ#JvexTiVey zjc7DV@NkeTmp*rM2;rL3*N~{}`1lx~T>2D6ys~=*48ve_EX3q*leC_0L(?>LT?b%! zdD)d%k|bnV_8i-LLI{Kq)YR1Sazg{l!w=E~I4*{5+pL6F=>O_V`oH*^SS*$#|EDkv zgFs+EMV6Kj?^OYS;Nc)APn@Eovkgg-C@syQ$>)f~lPz&+Gwy(0RL0e-R{@AbA}lN{ z(%IF{xw9VvpzAv2<>js}=t<(ym~7joxVYG5%MdW{Z%FNygZktuQ}>5x@9Nk9> z%JlRU-4`z)$qo_1HF-i&6l!bh2>AE81SH;OvUg~SKfuA~nwYsiL`PRA7ccZsRu&*E zsxXTW?n38{#fOW?+6X9R0Kx}Ug1bBIBx3saA>M0wpQgq}Dr=774`zRSIAIzwRv*t3 z|6`t*t^rg?fFE|QfKx>E^G(cXDt&#|Fr$&Y$N^+u5#`l&)EzyxZSwm7NnnTP9DXP(4sABZyPdr@{r2fTh{@!?W=uHM@4}{@6;R807W=7gCe`9}SA(iEpq7oiO z;O1aK0wgSLd3LN7*c3o9Pyqx06|jLP3d)=vn_F`P2m^mP4_*aI00qbIxyOhD2C(4} b^WWlc-6EIuR>CZG00000NkvXXu0mjfn7$9& literal 0 HcmV?d00001 diff --git a/data/icons/32x32/session-properties.svg b/data/icons/32x32/session-properties.svg new file mode 100644 index 00000000..5bb14559 --- /dev/null +++ b/data/icons/32x32/session-properties.svg @@ -0,0 +1,490 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + Gnome Session Properties + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am new file mode 100644 index 00000000..13b0cf36 --- /dev/null +++ b/data/icons/48x48/Makefile.am @@ -0,0 +1,25 @@ +size = 48x48 + +themedir = $(datadir)/icons/hicolor +iconsdir = $(themedir)/$(size)/apps + +icons_DATA = session-properties.png + +gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor + +install-data-hook: + @-if test -z "$(DESTDIR)"; then \ + echo "Updating Gtk icon cache."; \ + $(gtk_update_icon_cache); \ + else \ + echo "*** Icon cache not updated. After install, run this:"; \ + echo "*** $(gtk_update_icon_cache)"; \ + fi + +uninstall-hook: + @rm -f $(DESTDIR)$(themedir)/icon-theme.cache + +EXTRA_DIST = \ + $(icons_DATA) + +-include $(top_srcdir)/git.mk diff --git a/data/icons/48x48/session-properties.png b/data/icons/48x48/session-properties.png new file mode 100644 index 0000000000000000000000000000000000000000..32c2358ca45a07e86fbb03d75ec4742e8203091a GIT binary patch literal 1839 zcmV+~2hjM5P)o(6r8k8?YI(DKwnU$ zscQXx?!c!0iv$|d3jp#tKO3Mop|HfdwiG^%(Bv{YDXBhor03QDNj@<7u-QR}Ec zVmpa1^{zMG*>esLv%B8Q?96WL#>pp*>^W!7Io~(`|9394!WhG?47u3^){9$SfL;3M z;O`G6Kbf~)=uVkOY^kjqNkSk%G`=sEP%uKzEQ;faSmfJ3{?2z7p+dmQlJnw@ZOKQr zboJpxqVWlr$ygr&M18@s@xn<$<*n9uUyaL=`79fO>e|+r^U%h+#PIN(` zwf+>yR5$Xm?ILu%@)` zg-9uhwY8C)y(IAbTNYs6I=^u3t{u6y{{F2p;AU7h32cP;`LSo46HJUh3X zZvRKyeM6UVA~)ycly^06ou6a!>?~9YFvjRFfA4pNv(t*do?n2p}$TPH<;fLe87u(KE0yLT^AZk*}0*6iQE9~ua-f+8S=muIbb zKuXDzN8a3!v=hKjAG<$fyz2Y<2(*wwB~1TszO@GHKyV5P(ej%##xQ+xo{czG2;ub? zgg_HZ0h-p#X^i33rygsKX-I!Tu)<8NP4nj5w{IWDn2OEc`Vlr}pa(1|D5$lL!p!O5 zy)mU!xlAdAWnKSX%70_GhCmMpArNAXa+o>qh*K2-r4)yreTE-A{-c&iS0Xfp!aPvf zQJ6XJ*s&%+DaCV#pXKd$-d; zc<331hITPJGFl!ypU)GCL;~9e^%;cPX|yH+Ysbd02)M4x^o5TY92{hHWRxpcu9OGg zv> zGm9Vj@rlC>4i1&yeCfI60Gw@=7%GY&M(a-23O4IPyFnW-kDJ4Fm{LmqNAV zCw@C#&iP960GUjNOeW(?Qc4+k`8`uYJRWEJz;=H4{l|Iw(92OLZN^Vf-l|sMS2S#Ac~=D$^%L%j=bXszk(?L(*xc--Ck6e>=n zl^#$^h0YE)3XbD|R#5yxR+B>h3z-mtN5An+&YV5NYsX)ur>AFK8@7!^{a&bniF3Ie zU-*O4LoGjaFjEap>&qEQ*){>O~|H2~w$43tzIEeYwy^1YvkR4T>KfB6J6GnYciHVfOf8Q6X&0|TF9;P%hf*H_+DuF^^=(&=>7 z!|8OIbUIBknIw@&aO%`wszeAOn3=i6gAa_<4WzYZYHEu4)Noy0Fbr2N`t)hvwsyxhoJgWY z`UXs#LLtpU_5vr~II&h$E1-1RnTzd&*v^1n4Q}T(Ru|^T&d+dc@&q9G+QScf^>;st zW!3LSEug=yG#FYd3hpY`vPh9&^)K~^yN(mwIwh+PwqRX?>FTU}&-d}zFft|5?ZtrNRV`B{Y)vYWpTt#pXUA=wS z_Vt~}f{@9%96$4cTFERP1EN6G#`_qjKAd{$6)Au6nUDT^`CA&RtM%>;Mk|cgNISxY zrcn_By^>qJ^rw$cjZXjtU{x4n5JE(NE}*@5C4e@-#S_@tI4yr3ZU_ye0R`lNERX?~ zfLUXVCjcnzuiNkhwBdzF7aMLSl0_aao`5A_#T1DPzio0+j07;oY}#(E$iu>ms5U-i deFfY~_&?#hc%)mzygmQ`002ovPDHLkV1i5*a;5+P literal 0 HcmV?d00001 diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am new file mode 100644 index 00000000..8b6c5491 --- /dev/null +++ b/data/icons/Makefile.am @@ -0,0 +1,3 @@ +SUBDIRS = 16x16 22x22 24x24 32x32 48x48 scalable symbolic + +-include $(top_srcdir)/git.mk diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am new file mode 100644 index 00000000..4ff67b7b --- /dev/null +++ b/data/icons/scalable/Makefile.am @@ -0,0 +1,25 @@ +size = scalable + +themedir = $(datadir)/icons/hicolor +iconsdir = $(themedir)/$(size)/apps + +icons_DATA = session-properties.svg + +gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor + +install-data-hook: + @-if test -z "$(DESTDIR)"; then \ + echo "Updating Gtk icon cache."; \ + $(gtk_update_icon_cache); \ + else \ + echo "*** Icon cache not updated. After install, run this:"; \ + echo "*** $(gtk_update_icon_cache)"; \ + fi + +uninstall-hook: + @rm -f $(DESTDIR)$(themedir)/icon-theme.cache + +EXTRA_DIST = \ + $(icons_DATA) + +-include $(top_srcdir)/git.mk diff --git a/data/icons/scalable/session-properties.svg b/data/icons/scalable/session-properties.svg new file mode 100644 index 00000000..cec2c39e --- /dev/null +++ b/data/icons/scalable/session-properties.svg @@ -0,0 +1,515 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + Gnome Session Properties + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/symbolic/Makefile.am b/data/icons/symbolic/Makefile.am new file mode 100644 index 00000000..670d0a5a --- /dev/null +++ b/data/icons/symbolic/Makefile.am @@ -0,0 +1,25 @@ +size = symbolic + +themedir = $(datadir)/icons/hicolor +iconsdir = $(themedir)/$(size)/apps + +icons_DATA = session-properties-symbolic.svg + +gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor + +install-data-hook: + @-if test -z "$(DESTDIR)"; then \ + echo "Updating Gtk icon cache."; \ + $(gtk_update_icon_cache); \ + else \ + echo "*** Icon cache not updated. After install, run this:"; \ + echo "*** $(gtk_update_icon_cache)"; \ + fi + +uninstall-hook: + @rm -f $(DESTDIR)$(themedir)/icon-theme.cache + +EXTRA_DIST = \ + $(icons_DATA) + +-include $(top_srcdir)/git.mk diff --git a/data/icons/symbolic/session-properties-symbolic.svg b/data/icons/symbolic/session-properties-symbolic.svg new file mode 100644 index 00000000..e628ecd1 --- /dev/null +++ b/data/icons/symbolic/session-properties-symbolic.svg @@ -0,0 +1,28 @@ + + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + + + + Gnome Symbolic Icon Theme + + + + + + + + + + + diff --git a/data/session-properties.ui b/data/session-properties.ui new file mode 100644 index 00000000..1f0cb9a5 --- /dev/null +++ b/data/session-properties.ui @@ -0,0 +1,323 @@ + + + + + + True + True + 6 + + + True + 12 + vertical + 3 + + + True + 0 + 3 + 3 + Additional startup _programs: + True + session_properties_treeview + + + False + 0 + + + + + True + 6 + + + True + True + never + automatic + etched-in + + + 210 + True + True + + + + + 0 + + + + + True + 6 + start + + + gtk-add + True + True + True + True + + + False + False + 0 + + + + + gtk-remove + True + False + True + True + True + + + False + False + 1 + + + + + gtk-edit + True + False + True + True + True + + + False + False + 2 + + + + + False + False + 1 + + + + + 1 + + + + + + + True + Startup Programs + + + False + + + + + True + 12 + vertical + 6 + + + _Automatically remember running applications when logging out + True + True + False + True + True + + + False + False + 0 + + + + + True + + + True + True + + + True + 4 + + + True + gtk-save + + + False + False + 0 + + + + + True + _Remember Currently Running Applications + True + + + 1 + + + + + + + False + False + 0 + + + + + False + False + 1 + + + + + 1 + + + + + True + Options + + + 1 + False + + + + + True + 6 + 3 + 2 + 12 + 6 + + + True + 12 + + + True + True + ● + + + 0 + + + + + Browse… + True + True + True + + + False + False + 1 + + + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + True + True + ● + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + True + True + ● + + + 1 + 2 + GTK_FILL + + + + + True + 0 + Comm_ent: + True + label2 + + + 2 + 3 + GTK_FILL + GTK_FILL + + + + + True + 0 + Co_mmand: + True + session_properties_command_entry + + + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + 0 + _Name: + True + session_properties_name_entry + + + GTK_FILL + GTK_FILL + + + + diff --git a/doc/man/gnome-session.1 b/doc/man/gnome-session.1 index bf9cf808..35c062c5 100644 --- a/doc/man/gnome-session.1 +++ b/doc/man/gnome-session.1 @@ -67,46 +67,48 @@ Name=GNOME RequiredComponents=gnome-shell;gnome-settings-daemon; .in .fi .PP The \fB.session\fP files are looked for in \fB$XDG_CONFIG_HOME/gnome-session/sessions\fP, \fB$XDG_CONFIG_DIRS/gnome-session/sessions\fP and \fB$XDG_DATA_DIRS/gnome-session/sessions\fP. .SH ENVIRONMENT \fIgnome-session\fP sets several environment variables for the use of its child processes: .PP .B SESSION_MANAGER .IP This variable is used by session-manager aware clients to contact gnome-session. .PP .B DISPLAY .IP This variable is set to the X display being used by \fIgnome-session\fP. Note that if the \fI--display\fP option is used this might be different from the setting of the environment variable when gnome-session is invoked. .SH FILES .PP .B $XDG_CONFIG_HOME/config/autostart .B $XDG_CONFIG_DIRS/config/autostart .B /usr/share/gnome/autostart .IP The applications defined in those directories will be started on login. +\fIgnome-session-properties(1)\fP can be used to easily configure them. .PP .B $XDG_CONFIG_HOME/gnome-session/sessions .B $XDG_CONFIG_DIRS/gnome-session/sessions .B $XDG_DATA_DIRS/gnome-session/sessions .IP These directories contain the \fB.session\fP files that can be used with the \fI--session\fP option. .PP .B $XDG_CONFIG_HOME/gnome-session/saved-session .IP This directory contains the list of applications of the saved session. .SH BUGS If you find bugs in the \fIgnome-session\fP program, please report these on https://bugzilla.gnome.org. .SH SEE ALSO +.BR gnome-session-properties(1) .BR gnome-session-quit(1) diff --git a/po/POTFILES.in b/po/POTFILES.in index cc1170aa..76882645 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,18 +1,19 @@ # List of source files containing translatable strings. # Please keep this file sorted alphabetically. data/gnome-custom-session.desktop.in data/gnome.desktop.in data/gnome-xorg.desktop.in data/gnome-dummy.session.desktop.in.in data/gnome.session.desktop.in.in [type: gettext/glade]data/session-selector.ui +[type: gettext/glade]data/session-properties.ui gnome-session/gsm-fail-whale-dialog.c gnome-session/gsm-manager.c gnome-session/gsm-process-helper.c gnome-session/gsm-util.c gnome-session/gsm-xsmp-client.c gnome-session/gsm-xsmp-server.c gnome-session/main.c tools/gnome-session-inhibit.c tools/gnome-session-selector.c tools/gnome-session-quit.c -- 2.14.2