Index: exo-helper/exo-helper-chooser-dialog.c
===================================================================
--- exo-helper/exo-helper-chooser-dialog.c	(Revision 27526)
+++ exo-helper/exo-helper-chooser-dialog.c	(Arbeitskopie)
@@ -92,7 +92,7 @@ exo_helper_chooser_dialog_init (ExoHelpe
   GtkWidget      *box;
 
   /* verify category settings */
-  g_assert (EXO_HELPER_N_CATEGORIES == 3);
+  g_assert (EXO_HELPER_N_CATEGORIES == 4);
 
   gtk_dialog_add_button (GTK_DIALOG (chooser_dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
   gtk_dialog_set_has_separator (GTK_DIALOG (chooser_dialog), FALSE);
@@ -202,6 +202,31 @@ exo_helper_chooser_dialog_init (ExoHelpe
   gtk_widget_show (vbox);
 
   /*
+     File Manager
+   */
+  frame = g_object_new (GTK_TYPE_FRAME, "border-width", 0, "shadow-type", GTK_SHADOW_NONE, NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  label = g_object_new (GTK_TYPE_LABEL, "attributes", attr_list_bold, "label", _("Filemanager"), NULL);
+  gtk_frame_set_label_widget (GTK_FRAME (frame), label);
+  gtk_widget_show (label);
+
+  box = g_object_new (GTK_TYPE_VBOX, "border-width", 12, "spacing", 12, NULL);
+  gtk_container_add (GTK_CONTAINER (frame), box);
+  gtk_widget_show (box);
+
+  label = gtk_label_new (_("The preferred File Manager will be used to\n"
+                           "browse the contents of folders."));
+  gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.0f);
+  gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  chooser = exo_helper_chooser_new (EXO_HELPER_FILEMANAGER);
+  gtk_box_pack_start (GTK_BOX (box), chooser, FALSE, FALSE, 0);
+  gtk_widget_show (chooser);
+
+  /*
      Terminal Emulator
    */
   frame = g_object_new (GTK_TYPE_FRAME, "border-width", 0, "shadow-type", GTK_SHADOW_NONE, NULL);
Index: exo-helper/exo-helper-chooser.c
===================================================================
--- exo-helper/exo-helper-chooser.c	(Revision 27526)
+++ exo-helper/exo-helper-chooser.c	(Arbeitskopie)
@@ -350,6 +350,7 @@ menu_activate (GtkWidget        *item,
     N_("Failed to set default Web Browser"),
     N_("Failed to set default Mail Reader"),
     N_("Failed to set default Terminal Emulator"),
+    N_("Failed to set default File Manager"),
   };
 
   ExoHelper *helper;
@@ -535,6 +536,7 @@ menu_activate_other (GtkWidget        *i
     N_("Choose a custom Web Browser"),
     N_("Choose a custom Mail Reader"),
     N_("Choose a custom Terminal Emulator"),
+    N_("Choose a custom File Manager"),
   };
 
   static const gchar *BROWSE_MESSAGES[] =
@@ -542,6 +544,7 @@ menu_activate_other (GtkWidget        *i
     N_("Specify the application you want to use\nas default Web Browser for Xfce:"),
     N_("Specify the application you want to use\nas default Mail Reader for Xfce:"),
     N_("Specify the application you want to use\nas default Terminal Emulator for Xfce:"),
+    N_("Specify the application you want to use\nas default File Manager for Xfce:"),
   };
 
   const gchar *command;
@@ -556,7 +559,8 @@ menu_activate_other (GtkWidget        *i
   GtkWidget   *button;
 
   /* sanity check the category values */
-  g_assert (EXO_HELPER_N_CATEGORIES == 3);
+  g_assert (EXO_HELPER_N_CATEGORIES == G_N_ELEMENTS (BROWSE_TITLES));
+  g_assert (EXO_HELPER_N_CATEGORIES == G_N_ELEMENTS (BROWSE_MESSAGES));
 
   toplevel = gtk_widget_get_toplevel (GTK_WIDGET (chooser));
 
Index: exo-helper/exo-helper.h
===================================================================
--- exo-helper/exo-helper.h	(Revision 27526)
+++ exo-helper/exo-helper.h	(Arbeitskopie)
@@ -29,6 +29,7 @@ typedef enum /*< enum,prefix=EXO_HELPER 
   EXO_HELPER_WEBBROWSER,        /*< nick=WebBrowser >*/
   EXO_HELPER_MAILREADER,        /*< nick=MailReader >*/
   EXO_HELPER_TERMINALEMULATOR,  /*< nick=TerminalEmulator >*/
+  EXO_HELPER_FILEMANAGER,       /*< nick=FileManager >*/
   EXO_HELPER_N_CATEGORIES,      /*< skip >*/
 } ExoHelperCategory;
 
Index: exo-helper/main.c
===================================================================
--- exo-helper/main.c	(Revision 27526)
+++ exo-helper/main.c	(Arbeitskopie)
@@ -42,6 +42,7 @@ static const gchar *CATEGORY_EXEC_ERRORS
   N_("Failed to execute default Web Browser"),
   N_("Failed to execute default Mail Reader"),
   N_("Failed to execute default Terminal Emulator"),
+  N_("Failed to execute default File Manager"),
 };
 
 
@@ -64,11 +65,12 @@ usage (void)
   g_print ("%s\n", _("The following TYPEs are supported for the --launch command:"));
   g_print ("\n");
 
-  /* Note to Translators: Do not translate the TYPEs (WebBrowser, MailReader, TerminalEmulator),
-   * since the exo-helper utility will not accept localized TYPEs.
+  /* Note to Translators: Do not translate the TYPEs (WebBrowser, MailReader, FileManager,
+     TerminalEmulator), since the exo-helper utility will not accept localized TYPEs.
    */
   g_print ("%s\n", _("  WebBrowser       - The preferred Web Browser.\n"
                      "  MailReader       - The preferred Mail Reader.\n"
+                     "  FileManager      - The preferred File Manager.\n"
                      "  TerminalEmulator - The preferred Terminal Emulator."));
   g_print ("\n");
 }