Index: vfs-methods/themus/themus-theme-applier.c
===================================================================
--- vfs-methods/themus/themus-theme-applier.c	(révision 7083)
+++ vfs-methods/themus/themus-theme-applier.c	(copie de travail)
@@ -17,12 +17,15 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 #include <stdlib.h>
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <glade/glade.h>
 #include <libgnome/libgnome.h>
+#include <libgnomeui/gnome-ui-init.h>
 #include <libgnomevfs/gnome-vfs.h>
 #include <gconf/gconf-client.h>
 
@@ -40,40 +43,47 @@ int main (int argc, char **argv)
 	GtkWidget *font_dialog;
 	GtkWidget *font_sample;
 	gboolean apply_font = FALSE;
-	poptContext ctx;
-	gchar **args;
+	GOptionContext *context;
+	gchar **arguments = NULL;
+	const GOptionEntry options[] = {
+		{ G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_STRING_ARRAY, &arguments, NULL, N_("[FILE]") },
+		{NULL}
+	};
 
-	gtk_init (&argc, &argv);
-	program = gnome_program_init ("ThemeApplier", "0.3.0", LIBGNOME_MODULE,
-				      argc, argv, GNOME_PARAM_NONE);
-	
-	g_object_get (program, GNOME_PARAM_POPT_CONTEXT, &ctx, NULL);
-	args = (char**) poptGetArgs(ctx);
+	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+	textdomain (GETTEXT_PACKAGE);
 
-	if (!args) return 1;
+	context = g_option_context_new("- GNOME Theme Applier");
+#if GLIB_CHECK_VERSION (2, 12, 0)
+	g_option_context_set_translation_domain (context, GETTEXT_PACKAGE);
+#endif
+	g_option_context_add_main_entries(context, options, NULL);
+
+	program = gnome_program_init ("themus-theme-applier", VERSION,
+				      LIBGNOMEUI_MODULE,
+				      argc, argv,
+				      GNOME_PARAM_GOPTION_CONTEXT, context,
+				      GNOME_PARAM_NONE);
+
+	if (!arguments || g_strv_length (arguments) != 1)
+		 goto loser; /* FIXME: print help once bug 336089 is fixed */
 
-	gnome_vfs_init ();
 	gnome_theme_init (NULL);
-		
-	uri = gnome_vfs_uri_new (args[0]);
 
-	if (!uri)
-	{
-		g_object_unref (program);
-		return 1;
-	}
+	uri = gnome_vfs_uri_new (arguments[0]);
+	g_strfreev (arguments);
 
+	if (!uri)
+		goto loser;
+		
 	theme = gnome_theme_read_meta_theme (uri);
 	gnome_vfs_uri_unref (uri);
 
 	if (!theme)
-	{
-		g_object_unref (program);
-		return 1;
-	}
+		goto loser; /* FIXME: print error message? */
 
 	if (theme->application_font) {
-		glade_init ();
 		font_xml = glade_xml_new (GNOMECC_GLADE_DIR "/apply-font.glade",
 					  NULL, NULL);
 		if (font_xml) {
@@ -104,6 +114,12 @@ int main (int argc, char **argv)
 		g_object_unref (client);
 	}
 
-	g_free (program);
+	g_object_unref (program);
+
 	return 0;
+
+loser:
+	g_object_unref (program);
+
+	return 1;
 }
Index: vfs-methods/themus/apply-font.glade
===================================================================
--- vfs-methods/themus/apply-font.glade	(révision 7076)
+++ vfs-methods/themus/apply-font.glade	(copie de travail)
@@ -4,7 +4,7 @@
 <glade-interface>
 
 <widget class="GtkDialog" id="ApplyFontAlert">
-  <property name="border_width">6</property>
+  <property name="border_width">5</property>
   <property name="visible">True</property>
   <property name="title" translatable="yes"> </property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
@@ -12,7 +12,7 @@
     <widget class="GtkVBox" id="dialog-vbox1">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
-      <property name="spacing">12</property>
+      <property name="spacing">14</property>
 
       <child internal-child="action_area">
 	<widget class="GtkHButtonBox" id="dialog-action_area1">
@@ -113,7 +113,7 @@
 
       <child>
 	<widget class="GtkHBox" id="hbox1">
-	  <property name="border_width">6</property>
+	  <property name="border_width">5</property>
 	  <property name="visible">True</property>
 	  <property name="homogeneous">False</property>
 	  <property name="spacing">12</property>
