Merge pull request #10 from glaubitz/master

Changes to allow co-installation of mdm with gdm on Debian.

config/mdm.conf.in

@@ -384,7 +384,7 @@ GtkTheme=Clearlooks
 # greeter.
 Browser=true
 # The default picture in the browser.
-DefaultFace=@pixmapdir@/nobody.png
+DefaultFace=@pixmapdir@/mdm-nobody.png
 # User ID's less than the MinimalUID value will not be included in the face
 # browser or in the mdmselection list for Automatic/Timed login.  They will not
 # be displayed regardless of the settings for Include and Exclude.
@@ -541,7 +541,7 @@ PreFetchProgram=@MDMPREFETCHCMD@
 # or selects Run XDMCP chooser from the system menu
 [chooser]
 # Default image for hosts.
-#DefaultHostImg=@pixmapdir@/nohost.png
+#DefaultHostImg=@pixmapdir@/mdm-nohost.png
 # Directory with host images, they are named by the hosts: host or host.png.
 HostImageDir=@datadir@/hosts/
 # Time we scan for hosts (well only the time we tell the user we are scanning

daemon/mdm-daemon-config-entries.h

@@ -402,7 +402,7 @@ static const MdmConfigEntry mdm_daemon_config_entries [] = {
 	{ MDM_CONFIG_GROUP_GREETER, "Exclude", MDM_CONFIG_VALUE_STRING, "bin,daemon,adm,lp,sync,shutdown,halt,mail,news,uucp,operator,nobody,mdm,postgres,pvm,rpm,nfsnobody,pcap", MDM_ID_EXCLUDE },
 	{ MDM_CONFIG_GROUP_GREETER, "IncludeAll", MDM_CONFIG_VALUE_BOOL, "false", MDM_ID_INCLUDE_ALL },
 	{ MDM_CONFIG_GROUP_GREETER, "MinimalUID", MDM_CONFIG_VALUE_INT, "100", MDM_ID_MINIMAL_UID },
-	{ MDM_CONFIG_GROUP_GREETER, "DefaultFace", MDM_CONFIG_VALUE_STRING, PIXMAPDIR "/nobody.png", MDM_ID_DEFAULT_FACE },
+	{ MDM_CONFIG_GROUP_GREETER, "DefaultFace", MDM_CONFIG_VALUE_STRING, PIXMAPDIR "/mdm-nobody.png", MDM_ID_DEFAULT_FACE },
 	{ MDM_CONFIG_GROUP_GREETER, "GlobalFaceDir", MDM_CONFIG_VALUE_STRING, DATADIR "/pixmaps/faces/", MDM_ID_GLOBAL_FACE_DIR },
 	{ MDM_CONFIG_GROUP_GREETER, "LocaleFile", MDM_CONFIG_VALUE_STRING, MDMLOCALEDIR "/locale.alias", MDM_ID_LOCALE_FILE },
 	{ MDM_CONFIG_GROUP_GREETER, "Logo", MDM_CONFIG_VALUE_STRING, PIXMAPDIR "/mdm-foot-logo.png", MDM_ID_LOGO },
@@ -468,7 +468,7 @@ static const MdmConfigEntry mdm_daemon_config_entries [] = {
 	{ MDM_CONFIG_GROUP_DAEMON, "SoundProgram", MDM_CONFIG_VALUE_STRING, SOUND_PROGRAM, MDM_ID_SOUND_PROGRAM },
 
 	{ MDM_CONFIG_GROUP_CHOOSER, "ScanTime", MDM_CONFIG_VALUE_INT, "4", MDM_ID_SCAN_TIME },
-	{ MDM_CONFIG_GROUP_CHOOSER, "DefaultHostImg", MDM_CONFIG_VALUE_STRING, PIXMAPDIR "/nohost.png", MDM_ID_DEFAULT_HOST_IMG },
+	{ MDM_CONFIG_GROUP_CHOOSER, "DefaultHostImg", MDM_CONFIG_VALUE_STRING, PIXMAPDIR "/mdm-nohost.png", MDM_ID_DEFAULT_HOST_IMG },
 	{ MDM_CONFIG_GROUP_CHOOSER, "HostImageDir", MDM_CONFIG_VALUE_STRING, DATADIR "/hosts/", MDM_ID_HOST_IMAGE_DIR },
 	{ MDM_CONFIG_GROUP_CHOOSER, "Hosts", MDM_CONFIG_VALUE_STRING, "", MDM_ID_HOSTS },
 	{ MDM_CONFIG_GROUP_CHOOSER, "Multicast", MDM_CONFIG_VALUE_BOOL, "false", MDM_ID_MULTICAST },

daemon/mdm-daemon-config-keys.h

@@ -152,7 +152,7 @@ G_BEGIN_DECLS
 #define MDM_KEY_EXCLUDE "greeter/Exclude=bin,daemon,adm,lp,sync,shutdown,halt,mail,news,uucp,operator,nobody,mdm,postgres,pvm,rpm,nfsnobody,pcap"
 #define MDM_KEY_INCLUDE_ALL "greeter/IncludeAll=false"
 #define MDM_KEY_MINIMAL_UID "greeter/MinimalUID=100"
-#define MDM_KEY_DEFAULT_FACE "greeter/DefaultFace=" PIXMAPDIR "/nobody.png"
+#define MDM_KEY_DEFAULT_FACE "greeter/DefaultFace=" PIXMAPDIR "/mdm-nobody.png"
 #define MDM_KEY_GLOBAL_FACE_DIR "greeter/GlobalFaceDir=" DATADIR "/pixmaps/faces/"
 #define MDM_KEY_LOCALE_FILE "greeter/LocaleFile=" MDMLOCALEDIR "/locale.alias"
 #define MDM_KEY_LOGO "greeter/Logo=" PIXMAPDIR "/mdm-foot-logo.png"
@@ -201,7 +201,7 @@ G_BEGIN_DECLS
 #define MDM_KEY_SOUND_ON_LOGIN_FAILURE_FILE "greeter/SoundOnLoginFailureFile="
 #define MDM_KEY_SOUND_PROGRAM "daemon/SoundProgram=" SOUND_PROGRAM
 #define MDM_KEY_SCAN_TIME "chooser/ScanTime=4"
-#define MDM_KEY_DEFAULT_HOST_IMG "chooser/DefaultHostImg=" PIXMAPDIR "/nohost.png"
+#define MDM_KEY_DEFAULT_HOST_IMG "chooser/DefaultHostImg=" PIXMAPDIR "/mdm-nohost.png"
 #define MDM_KEY_HOST_IMAGE_DIR "chooser/HostImageDir=" DATADIR "/hosts/"
 #define MDM_KEY_HOSTS "chooser/Hosts="
 #define MDM_KEY_MULTICAST "chooser/Multicast=false"

debian/control

@@ -1,8 +1,3 @@
-# This file is autogenerated. DO NOT EDIT!
-# 
-# Modifications should be made to debian/control.in instead.
-# This file is regenerated automatically in the clean target.
-
 Source: mdm
 Section: gnome
 Priority: optional
@@ -62,9 +57,7 @@ Provides: x-display-manager
 Conflicts: fast-user-switch-applet (<< 2.17.4),
            gnome-session (<< 2.19.2),
            gnome-panel (<< 2.19.2),
-           gnome-screensaver (<< 2.17.7),
-           gdm,
-           gdm3
+           gnome-screensaver (<< 2.17.7)
 Description: GNOME Display Manager
  mdm provides the equivalent of a "login:" prompt for X displays- it
  pops up a login window and starts an X session.

docs/C/mdm.xml

@@ -608,7 +608,7 @@
         "stock_person" icon defined in the current GTK+ theme.  If no
         such image is defined, it will fallback to the image specified in the
         <filename>DefaultFace</filename> configuration option, normally
-        <filename>&lt;share&gt;/pixmaps/nobody.png</filename>.
+        <filename>&lt;share&gt;/pixmaps/mdm-nobody.png</filename>.
       </para>
 
       <para>
@@ -4176,7 +4176,7 @@ mdm:.my.domain
           <varlistentry>
             <term>DefaultHostImage</term>
             <listitem>
-              <synopsis>DefaultHostImage=&lt;share&gt;/pixmaps/nohost.png</synopsis>
+              <synopsis>DefaultHostImage=&lt;share&gt;/pixmaps/mdm-nohost.png</synopsis>
               <para>
                 File name for the default host icon. This image will be
                 displayed if no icon is specified for a given host. The

docs/de/de.po

@@ -782,7 +782,7 @@ msgid ""
 "If a user has no defined face image, MDM will use the \"stock_person\" icon "
 "defined in the current GTK+ theme. If no such image is defined, it will "
 "fallback to the image specified in the <filename>DefaultFace</filename> "
-"configuration option, normally <filename>&lt;share&gt;/pixmaps/nobody.png</"
+"configuration option, normally <filename>&lt;share&gt;/pixmaps/mdm-nobody.png</"
 "filename>."
 msgstr ""
 
@@ -4821,8 +4821,8 @@ msgstr "DefaultHostImage"
 
 #: C/mdm.xml:4162(synopsis)
 #, no-wrap
-msgid "DefaultHostImage=&lt;share&gt;/pixmaps/nohost.png"
-msgstr "DefaultHostImage=&lt;share&gt;/pixmaps/nohost.png"
+msgid "DefaultHostImage=&lt;share&gt;/pixmaps/mdm-nohost.png"
+msgstr "DefaultHostImage=&lt;share&gt;/pixmaps/mdm-nohost.png"
 
 #: C/mdm.xml:4163(para)
 msgid ""

docs/de/mdm.xml

@@ -588,7 +588,7 @@
         "stock_person" icon defined in the current GTK+ theme.  If no
         such image is defined, it will fallback to the image specified in the
         <filename>DefaultFace</filename> configuration option, normally
-        <filename>&lt;share&gt;/pixmaps/nobody.png</filename>.
+        <filename>&lt;share&gt;/pixmaps/mdm-nobody.png</filename>.
       </para>
 
       <para>
@@ -4104,7 +4104,7 @@ mdm:.my.domain
           <varlistentry>
             <term>DefaultHostImage</term>
             <listitem>
-              <synopsis>DefaultHostImage=&lt;share&gt;/pixmaps/nohost.png</synopsis>
+              <synopsis>DefaultHostImage=&lt;share&gt;/pixmaps/mdm-nohost.png</synopsis>
               <para>
                 File name for the default host icon. This image will be
                 displayed if no icon is specified for a given host. The

docs/en_GB/en_GB.po

@@ -394,8 +394,8 @@ msgid "MDM will first look for the user's face image in <filename>~/.face</filen
 msgstr "MDM will first look for the user's face image in <filename>~/.face</filename>. If not found, it will try <filename>~/.face.icon</filename>. If still not found, it will use the value defined for \"face/picture=\" in the <filename>~/.gnome2/mdm</filename> file. Lastly, it will try <filename>~/.gnome2/photo</filename> and <filename>~/.gnome/photo</filename> which are deprecated and supported for backwards compatibility."
 
 #: C/mdm.xml:560(para)
-msgid "If a user has no defined face image, MDM will use the \"stock_person\" icon defined in the current GTK+ theme. If no such image is defined, it will fallback to the image specified in the <filename>DefaultFace</filename> configuration option, normally <filename>&lt;share&gt;/pixmaps/nobody.png</filename>."
-msgstr "If a user has no defined face image, MDM will use the \"stock_person\" icon defined in the current GTK+ theme. If no such image is defined, it will fallback to the image specified in the <filename>DefaultFace</filename> configuration option, normally <filename>&lt;share&gt;/pixmaps/nobody.png</filename>."
+msgid "If a user has no defined face image, MDM will use the \"stock_person\" icon defined in the current GTK+ theme. If no such image is defined, it will fallback to the image specified in the <filename>DefaultFace</filename> configuration option, normally <filename>&lt;share&gt;/pixmaps/mdm-nobody.png</filename>."
+msgstr "If a user has no defined face image, MDM will use the \"stock_person\" icon defined in the current GTK+ theme. If no such image is defined, it will fallback to the image specified in the <filename>DefaultFace</filename> configuration option, normally <filename>&lt;share&gt;/pixmaps/mdm-nobody.png</filename>."
 
 #: C/mdm.xml:568(para)
 msgid "Please note that loading and scaling face icons located in user home directories can be a very time-consuming task. Since it not practical to load images over NIS or NFS, MDM does not attempt to load face images from remote home directories. Furthermore, MDM will give up loading face images after 5 seconds of activity and will only display the users whose pictures it has gotten so far. The <filename>Include</filename> configuration option can be used to specify a set of users who should appear on the face browser. As long as the users to include is of a reasonable size, there should not be a problem with MDM being unable to access the face images. To work around such problems, it is recommended to place face images in the directory specified by the <filename>GlobalFaceDir</filename> configuration option."
@@ -2977,8 +2977,8 @@ msgstr "DefaultHostImage"
 
 #: C/mdm.xml:3938(synopsis)
 #, no-wrap
-msgid "DefaultHostImage=&lt;share&gt;/pixmaps/nohost.png"
-msgstr "DefaultHostImage=&lt;share&gt;/pixmaps/nohost.png"
+msgid "DefaultHostImage=&lt;share&gt;/pixmaps/mdm-nohost.png"
+msgstr "DefaultHostImage=&lt;share&gt;/pixmaps/mdm-nohost.png"
 
 #: C/mdm.xml:3939(para)
 msgid "File name for the default host icon. This image will be displayed if no icon is specified for a given host. The file must be in a gdk-pixbuf supported format and it must be readable for the MDM user."

docs/en_GB/mdm.xml

@@ -364,7 +364,7 @@
 
       <para>MDM will first look for the user's face image in <filename>~/.face</filename>. If not found, it will try <filename>~/.face.icon</filename>. If still not found, it will use the value defined for "face/picture=" in the <filename>~/.gnome2/mdm</filename> file. Lastly, it will try <filename>~/.gnome2/photo</filename> and <filename>~/.gnome/photo</filename> which are deprecated and supported for backwards compatibility.</para>
 
-      <para>If a user has no defined face image, MDM will use the "stock_person" icon defined in the current GTK+ theme. If no such image is defined, it will fallback to the image specified in the <filename>DefaultFace</filename> configuration option, normally <filename>&lt;share&gt;/pixmaps/nobody.png</filename>.</para>
+      <para>If a user has no defined face image, MDM will use the "stock_person" icon defined in the current GTK+ theme. If no such image is defined, it will fallback to the image specified in the <filename>DefaultFace</filename> configuration option, normally <filename>&lt;share&gt;/pixmaps/mdm-nobody.png</filename>.</para>
 
       <para>Please note that loading and scaling face icons located in user home directories can be a very time-consuming task. Since it not practical to load images over NIS or NFS, MDM does not attempt to load face images from remote home directories. Furthermore, MDM will give up loading face images after 5 seconds of activity and will only display the users whose pictures it has gotten so far. The <filename>Include</filename> configuration option can be used to specify a set of users who should appear on the face browser. As long as the users to include is of a reasonable size, there should not be a problem with MDM being unable to access the face images. To work around such problems, it is recommended to place face images in the directory specified by the <filename>GlobalFaceDir</filename> configuration option.</para>
 
@@ -2505,7 +2505,7 @@ mdm:.my.domain
           <varlistentry>
             <term>DefaultHostImage</term>
             <listitem>
-              <synopsis>DefaultHostImage=&lt;share&gt;/pixmaps/nohost.png</synopsis>
+              <synopsis>DefaultHostImage=&lt;share&gt;/pixmaps/mdm-nohost.png</synopsis>
               <para>File name for the default host icon. This image will be displayed if no icon is specified for a given host. The file must be in a gdk-pixbuf supported format and it must be readable for the MDM user.</para>
             </listitem>
           </varlistentry>

docs/es/es.po

@@ -1086,14 +1086,14 @@ msgid ""
 "If a user has no defined face image, MDM will use the \"stock_person\" icon "
 "defined in the current GTK+ theme. If no such image is defined, it will "
 "fallback to the image specified in the <filename>DefaultFace</filename> "
-"configuration option, normally <filename>&lt;share&gt;/pixmaps/nobody.png</"
+"configuration option, normally <filename>&lt;share&gt;/pixmaps/mdm-nobody.png</"
 "filename>."
 msgstr ""
 "Si un usuario no tiene una imagen de rostro definida, MDM usará el icono "
 "\"stock_person\" definido en el tema GTK+ actual. Si dicha imagen no está "
 "definida, entonces usará la imagen especificada en la opción de "
 "configuración <filename>DefaultFace</filename> como resguardo, normalmente "
-"<filename>&lt;/share&gt;/pixmaps/nobody.png</filename>."
+"<filename>&lt;/share&gt;/pixmaps/mdm-nobody.png</filename>."
 
 #: C/mdm.xml:614(para)
 msgid ""
@@ -6693,8 +6693,8 @@ msgstr "DefaultHostImage"
 
 #: C/mdm.xml:4179(synopsis)
 #, no-wrap
-msgid "DefaultHostImage=&lt;share&gt;/pixmaps/nohost.png"
-msgstr "DefaultHostImage=&lt;share&gt;/pixmaps/nohost.png"
+msgid "DefaultHostImage=&lt;share&gt;/pixmaps/mdm-nohost.png"
+msgstr "DefaultHostImage=&lt;share&gt;/pixmaps/mdm-nohost.png"
 
 #: C/mdm.xml:4180(para)
 msgid ""

docs/es/mdm.xml

@@ -235,7 +235,7 @@
 
       <para>MDM primero buscará la imagen de la cara del usuario en <filename>~/.face</filename>. Si no la encuentra, intentará con <filename>~/.face.icon</filename>. Si aún no la encuentra, usará el valor definido para "face/picture=" en el archivo <filename>~/.gnome2/mdm</filename>. Por último intentará con <filename>~/.gnome2/photo</filename> y <filename>~/.gnome/photo</filename> los cuales están obsoletos y se soportan por compatibilidad hacia atrás.</para>
 
-      <para>Si un usuario no tiene una imagen de rostro definida, MDM usará el icono "stock_person" definido en el tema GTK+ actual. Si dicha imagen no está definida, entonces usará la imagen especificada en la opción de configuración <filename>DefaultFace</filename> como resguardo, normalmente <filename>&lt;/share&gt;/pixmaps/nobody.png</filename>.</para>
+      <para>Si un usuario no tiene una imagen de rostro definida, MDM usará el icono "stock_person" definido en el tema GTK+ actual. Si dicha imagen no está definida, entonces usará la imagen especificada en la opción de configuración <filename>DefaultFace</filename> como resguardo, normalmente <filename>&lt;/share&gt;/pixmaps/mdm-nobody.png</filename>.</para>
 
       <para>Note que cargar y escalar los iconos de rostros situados en los directorios personales de los usuarios puede ser una tarea que consuma mucho tiempo. Debido a que no es práctico cargar imágenes sobre NIS o NFS, MDM no intenta cargar imágenes de rostros desde directorios personales remotos. Además, MDM parará de cargar imágenes de rostros después de 5 segundos de actividad y sólo mostrará los usuarios cuyas imágenes haya obtenido hasta entonces. La opción <filename>Include</filename> de <filename>mdm.conf</filename> puede usarse para especificar un conjunto de usuarios que deberían aparecer en el visor de rostros. Mientras los usuarios a incluir tengan un tamaño razonable, no debería haber ningún problema con MDM siendo incapaz de acceder a las imágenes de rostros. Para evitar estos problemas, se recomienda situar las imágenes de rostros en el directorio especificado por la opción de configuración <filename>GlobalFaceDir</filename>.</para>
 
@@ -1830,7 +1830,7 @@ Greeter=/usr/lib/mdmgreeter
           <varlistentry>
             <term>DefaultHostImage</term>
             <listitem>
-              <synopsis>DefaultHostImage=&lt;share&gt;/pixmaps/nohost.png</synopsis>
+              <synopsis>DefaultHostImage=&lt;share&gt;/pixmaps/mdm-nohost.png</synopsis>
               <para>El nombre del archivo para el icono de host predeterminado. Esta imagen debe mostrarse si no hay ningún icono especificado en un host dado. El archivo debe estar en un formato soportado por gdk-pixbuf y deben tener permiso de lectura para el usuario de MDM.</para>
             </listitem>
           </varlistentry>