Add new QUERY_CUSTOM_CMD_LABELS and QUERY_CUSTOM_CMD_NO_RESTART_STATUS

2006-10-30  Brian Cameron  <brian.cameron@sun.com>

        * config/gdm.conf.in, daemon/gdm.c, daemon/gdm.h,
          daemon/gdmconfig.c, docs/C/gdm.xml, gui/gdmlogin.c,
          gui/greeter/greeter.c, gui/greeter/greeter_item.c,
          gui/greeter/greeter_configuration.h,
          gui/greeter/greeter_system.c:  Add new QUERY_CUSTOM_CMD_LABELS
          and QUERY_CUSTOM_CMD_NO_RESTART_STATUS commands and the
          new CustomCommandIsPersistent[0-9]

3 files changed, 147 insertions, 23 deletions

diff --git a/docs/C/gdm.xml b/docs/C/gdm.xml
index 9deeedcf..b36a3fd0 100644
--- a/docs/C/gdm.xml
+++ b/docs/C/gdm.xml
@@ -3999,6 +3999,23 @@ gdm:.my.domain
           </varlistentry>
           
           <varlistentry>
+            <term>CustomCommandIsPersistent[0-9]</term>
+            <listitem>
+              <synopsis>CustomCommandIsPersistent[0-9]=</synopsis>
+              <para>
+                Specifies if <filename>n-th</filename> &quot;Custom
+                Command&quot; will appear outside the login manager, for
+                example on the desktop through the Log Out/Shut Down dialogs.
+                If not specified the default value is &quot;false&quot;. This
+                option is only valid if corresponding
+                <filename>CustomCommand</filename> is defined. [0-9] represents
+                <filename>CustomCommand</filename> suffix and can be an integer
+                between 0 and 9.
+              </para>
+            </listitem>
+          </varlistentry>
+          
+          <varlistentry>
             <term>CustomCommandLabel[0-9]</term>
             <listitem>
               <synopsis>CustomCommandLabel[0-9]=</synopsis>
@@ -4006,10 +4023,11 @@ gdm:.my.domain
                 Specifies the stock label that will be displayed on the
                 <filename>n-th</filename> &quot;Custom Command&quot;
                 buttons and menu items. If not specified the default value is
-                &quot;_Custom[0-9]&quot;. This option is only valid if
+                &quot;Custom_[0-9]&quot;. This option is only valid if
                 corresponding <filename>CustomCommand</filename> is defined. 
                 [0-9] represents <filename>CustomCommand</filename> suffix
-                and can be an integer between 0 and 9.
+                and can be an integer between 0 and 9. This option can't contain
+                any semicolon characters (i.e. &quot;;&quot;).
               </para>
             </listitem>
           </varlistentry>
@@ -4022,7 +4040,7 @@ gdm:.my.domain
                 Specifies the stock label that will be displayed on the
                 <filename>n-th</filename> &quot;Custom Command&quot;
                 list items and radio buttons.  If not specified the default
-                value is  &quot;Execute _custom command [0-9]&quot;. This 
+                value is  &quot;Execute custom command _[0-9]&quot;. This 
                 option is only valid if corresponding
                 <filename>CustomCommand</filename> is defined.  [0-9]
                 represents <filename>CustomCommand</filename> suffix and
@@ -4042,7 +4060,14 @@ gdm:.my.domain
                 &quot;false&quot;. This option is only valid if corresponding
                 <filename>CustomCommand</filename> is defined.  [0-9]
                 represents <filename>CustomCommand</filename> suffix and
-                can be an integer between 0 and 9.
+                can be an integer between 0 and 9. In addition when
+                corresponding <filename>CustomCommandIsPersistent</filename> 
+                is set to true,  setting CustomCommandNoRestart to false will
+                place corresponding <filename>CustomCommand</filename> in the 
+                Shut Down dialog set of actions, setting it to true will place
+                corresponding 
+                <filename>CustomCommand</filename> in the Log Out dialog set of
+                actions.
               </para>
             </listitem>
           </varlistentry>
@@ -4796,6 +4821,50 @@ Answers:
 </screen>
       </sect3>
       
+      <sect3 id="querycustomcmdlabels">
+        <title>QUERY_CUSTOM_CMD_LABELS</title>
+<screen>
+ QUERY_CUSTOM_CMD_LABELS: Query labels belonging to exported custom
+                          commands Only supported on connections that
+                          passed AUTH_LOCAL.
+ Supported since: 2.5.90.0
+ Answers:
+   OK &lt;label1&gt;;&lt;label2&gt;;...
+      Where labelX is one of the labels belonging to CUSTOM_CMDX
+      (where X in [0,GDM_CUSTOM_COMMAND_MAX)).  An empty list can
+      also be returned if none of the custom commands are exported
+      outside login manager (no CustomCommandIsPersistent options
+      are set to true).  
+   ERROR &lt;err number&gt; &lt;english error description&gt;
+      0 = Not implemented
+      100 = Not authenticated
+      200 = Too many messages
+      999 = Unknown error
+</screen>
+      </sect3>
+      
+      <sect3 id="querycustomcmdnorestartstatus">
+        <title>QUERY_CUSTOM_CMD_NO_RESTART_STATUS</title>
+<screen>
+QUERY_CUSTOM_CMD_NO_RESTART_STATUS: Query NoRestart config options
+                                    for each of custom commands Only
+                                    supported on connections that
+                                    passed AUTH_LOCAL.
+Supported since: 2.5.90.0
+Answers:
+  OK &lt;status&gt;
+     Where each bit of the status represents NoRestart value for
+     each of the custom commands.
+     bit on (1):  NoRestart = true, 
+     bit off (0): NoRestart = false.
+  ERROR &lt;err number&gt; &lt;english error description&gt;
+     0 = Not implemented
+     100 = Not authenticated
+     200 = Too many messages
+     999 = Unknown error
+</screen>
+      </sect3>
+      
       <sect3 id="queryvt">
       <title>QUERY_VT</title>
 <screen>
@@ -6530,7 +6599,7 @@ homogeneous=&quot;bool&quot;&gt;
           <filename>config</filename>, _(&quot;_Configure&quot;
         </para>
         <para>
-          <filename>custom_cmd[0-9]</filename>, _(&quot;_Custom[0-9]&quot;
+          <filename>custom_cmd[0-9]</filename>, _(&quot;Custom_[0-9]&quot;
         </para>
         <para>
           <filename>disconnect</filename>, _(&quot;D_isconnect&quot;
@@ -7084,6 +7153,7 @@ Hosts=appserverone,appservertwo
           CustomCommandLRLabel0=Reboot into _Windoze
           CustomCommandText0=Are you sure you want to restart the computer into Windoze?
           CustomCommandTooltip0=Restarts the computer into Windoze
+          CustomCommandIsPersistent0=true
         </screen>
 
         CustomCommand0 specifies two commands separated by a semicolon:
@@ -7122,6 +7192,7 @@ Hosts=appserverone,appservertwo
           CustomCommandLRLabel0=Reboot into _Windoze
           CustomCommandText0=Are you sure you want to restart the computer into Windoze?
           CustomCommandTooltip0=Restarts the computer into Windoze
+          CustomCommandIsPersistent0=true
           
           CustomCommand1=/sbin/updatesystem;/usr/local/sbin/updatesystem
           CustomCommandLabel1=_Update Me
@@ -7142,6 +7213,7 @@ Hosts=appserverone,appservertwo
           CustomCommandLRLabel0=Reboot into _Windoze
           CustomCommandText0=Are you sure you want to restart the computer into Windoze?
           CustomCommandTooltip0=Restarts the computer into Windoze
+          CustomCommandIsPersistent0=true
           
           CustomCommand1=/sbin/updatesystem;/usr/local/sbin/updatesystem
           CustomCommandLabel1=_Update Me
diff --git a/docs/es/gdm.xml b/docs/es/gdm.xml
index 36f09d41..587c2b34 100644
--- a/docs/es/gdm.xml
+++ b/docs/es/gdm.xml
@@ -2506,8 +2506,8 @@ PostSession/
         <para>
           You can create up to 10 different commands. Gaps between command
           numbers are allowed and their relative positioning within the
-          section is not important as long as they conform to the permitted
-          range of [0-9].
+          section and with respect to each other is not important as long as
+          they conform to the permitted range of [0-9].
           
         </para>
           
@@ -2520,11 +2520,14 @@ PostSession/
               <synopsis>CustomCommand[0-9]=</synopsis>
               <para>
                 Full path and arguments to command to be executed when user
-                selects n-th "Custom Command" from the Actions menu.
-                This can be a ';' separated list of commands to try.  If the 
-                value is empty or missing, then the custom command is not
-                available.  By default this value is not enabled, so to enable 
-                "Custom Command" it must be set to a nonempty value. 
+                selects <filename>n-th</filename> "Custom Command"
+                from the Actions menu.  This can be a ';' separated list of
+                commands to try.  If the value is empty or missing, then the
+                custom command is not available.  By default this value is not
+                enabled, so to enable "Custom Command" it must be
+                set to a nonempty value.  [0-9] represents the
+                <filename>CustomCommand</filename> suffix and can be an
+                integer between 0 and 9. 
               </para>
             </listitem>
           </varlistentry>
@@ -2539,6 +2542,8 @@ PostSession/
                 buttons and menu items. If not specified the default value is
                 "_Custom[0-9]". This option is only valid if
                 corresponding <filename>CustomCommand</filename> is defined. 
+                [0-9] represents <filename>CustomCommand</filename> suffix
+                and can be an integer between 0 and 9.
               </para>
             </listitem>
           </varlistentry>
@@ -2553,7 +2558,9 @@ PostSession/
                 list items and radio buttons.  If not specified the default
                 value is  "Execute _custom command [0-9]". This 
                 option is only valid if corresponding
-                <filename>CustomCommand</filename> is defined.
+                <filename>CustomCommand</filename> is defined.  [0-9]
+                represents <filename>CustomCommand</filename> suffix and
+                can be an integer between 0 and 9.
               </para>
             </listitem>
           </varlistentry>
@@ -2567,7 +2574,9 @@ PostSession/
                 <filename>n-th</filename> "Custom Command"
                 has been executed. If not specified the default value is
                 "false". This option is only valid if corresponding
-                <filename>CustomCommand</filename> is defined.
+                <filename>CustomCommand</filename> is defined.  [0-9]
+                represents <filename>CustomCommand</filename> suffix and
+                can be an integer between 0 and 9.
               </para>
             </listitem>
           </varlistentry>
@@ -2583,6 +2592,8 @@ PostSession/
                 item has been activated.  If not specified the default value is
                 "Are you sure?". This option is only valid if
                 corresponding <filename>CustomCommand</filename> is defined.
+                [0-9] represents <filename>CustomCommand</filename> suffix and
+                can be an integer between 0 and 9.
               </para>
             </listitem>
           </varlistentry>
@@ -2597,6 +2608,8 @@ PostSession/
                 entries. If not specified the default value is  "Execute
                 custom command [0-9]". This option is only valid if
                 corresponding <filename>CustomCommand</filename> is defined.
+                [0-9] represents <filename>CustomCommand</filename> suffix and
+                can be an integer between 0 and 9.
               </para>
             </listitem>
           </varlistentry>         
@@ -4597,6 +4610,19 @@ homogeneous="bool"&gt;
           directory as the theme <filename>.xml</filename> file in
           <filename>&lt;share&gt;/gdm/themes/&lt;theme_name&gt;</filename>.
         </para>
+
+        <para>
+          Note that alternative image file can be specified using the altfile[n]
+	  property. GDM will use the last valid image filename specified. 
+	  For example:
+<screen>
+&lt;normal file="picture.png" altfile1="distribution-blah-image.png" altfile2="distribution-foo-image.png"/&gt;
+</screen>
+	 If <filename>distribution-foo-image.png</filename> is a valid image 
+	 filename it will be used. Otherwise distribution-blah-image.png will 
+	 be used if valid.
+        </para>
+
       </sect3>
 
       <sect3 id="listcoloronodes">
diff --git a/docs/uk/gdm.xml b/docs/uk/gdm.xml
index 1a2e58c9..d6e57d74 100644
--- a/docs/uk/gdm.xml
+++ b/docs/uk/gdm.xml
@@ -2597,8 +2597,8 @@ gdm:.my.domain
         <para>
           You can create up to 10 different commands. Gaps between command
           numbers are allowed and their relative positioning within the
-          section is not important as long as they conform to the permitted
-          range of [0-9].
+          section and with respect to each other is not important as long as
+          they conform to the permitted range of [0-9].
           
         </para>
           
@@ -2611,11 +2611,14 @@ gdm:.my.domain
               <synopsis>CustomCommand[0-9]=</synopsis>
               <para>
                 Full path and arguments to command to be executed when user
-                selects n-th "Custom Command" from the Actions menu.
-                This can be a ';' separated list of commands to try.  If the 
-                value is empty or missing, then the custom command is not
-                available.  By default this value is not enabled, so to enable 
-                "Custom Command" it must be set to a nonempty value. 
+                selects <filename>n-th</filename> "Custom Command"
+                from the Actions menu.  This can be a ';' separated list of
+                commands to try.  If the value is empty or missing, then the
+                custom command is not available.  By default this value is not
+                enabled, so to enable "Custom Command" it must be
+                set to a nonempty value.  [0-9] represents the
+                <filename>CustomCommand</filename> suffix and can be an
+                integer between 0 and 9. 
               </para>
             </listitem>
           </varlistentry>
@@ -2630,6 +2633,8 @@ gdm:.my.domain
                 buttons and menu items. If not specified the default value is
                 "_Custom[0-9]". This option is only valid if
                 corresponding <filename>CustomCommand</filename> is defined. 
+                [0-9] represents <filename>CustomCommand</filename> suffix
+                and can be an integer between 0 and 9.
               </para>
             </listitem>
           </varlistentry>
@@ -2644,7 +2649,9 @@ gdm:.my.domain
                 list items and radio buttons.  If not specified the default
                 value is  "Execute _custom command [0-9]". This 
                 option is only valid if corresponding
-                <filename>CustomCommand</filename> is defined.
+                <filename>CustomCommand</filename> is defined.  [0-9]
+                represents <filename>CustomCommand</filename> suffix and
+                can be an integer between 0 and 9.
               </para>
             </listitem>
           </varlistentry>
@@ -2658,7 +2665,9 @@ gdm:.my.domain
                 <filename>n-th</filename> "Custom Command"
                 has been executed. If not specified the default value is
                 "false". This option is only valid if corresponding
-                <filename>CustomCommand</filename> is defined.
+                <filename>CustomCommand</filename> is defined.  [0-9]
+                represents <filename>CustomCommand</filename> suffix and
+                can be an integer between 0 and 9.
               </para>
             </listitem>
           </varlistentry>
@@ -2674,6 +2683,8 @@ gdm:.my.domain
                 item has been activated.  If not specified the default value is
                 "Are you sure?". This option is only valid if
                 corresponding <filename>CustomCommand</filename> is defined.
+                [0-9] represents <filename>CustomCommand</filename> suffix and
+                can be an integer between 0 and 9.
               </para>
             </listitem>
           </varlistentry>
@@ -2688,6 +2699,8 @@ gdm:.my.domain
                 entries. If not specified the default value is  "Execute
                 custom command [0-9]". This option is only valid if
                 corresponding <filename>CustomCommand</filename> is defined.
+                [0-9] represents <filename>CustomCommand</filename> suffix and
+                can be an integer between 0 and 9.
               </para>
             </listitem>
           </varlistentry>         
@@ -4697,6 +4710,19 @@ homogeneous="bool"&gt;
         </para>
 
         <para>Зауважте, що відносні назви шляхів мають бути у тому самому каталозі, що й <filename>.xml</filename> файл теми у <filename>&lt;share&gt;/gdm/themes/&lt;theme_name&gt;</filename>.</para>
+
+        <para>
+          Note that alternative image file can be specified using the altfile[n]
+	  property. GDM will use the last valid image filename specified. 
+	  For example:
+<screen>
+&lt;normal file="picture.png" altfile1="distribution-blah-image.png" altfile2="distribution-foo-image.png"/&gt;
+</screen>
+	 If <filename>distribution-foo-image.png</filename> is a valid image 
+	 filename it will be used. Otherwise distribution-blah-image.png will 
+	 be used if valid.
+        </para>
+
       </sect3>
 
       <sect3 id="listcoloronodes">