[Goodies-commits] r6062 - xfburn/trunk/xfburn

[David Mohr]

Author: squisher
Date: 2008-11-11 20:28:24 +0000 (Tue, 11 Nov 2008)
New Revision: 6062

Modified:
   xfburn/trunk/xfburn/xfburn-main.c
   xfburn/trunk/xfburn/xfburn-main.h
Log:
Disabling the initial code for setting the starting directory - not worth the trouble right now

Modified: xfburn/trunk/xfburn/xfburn-main.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-main.c	2008-11-11 07:20:19 UTC (rev 6061)
+++ xfburn/trunk/xfburn/xfburn-main.c	2008-11-11 20:28:24 UTC (rev 6062)
@@ -70,23 +70,26 @@
 static gboolean add_audio_composition = FALSE;
 static gboolean blank = FALSE;
 static gchar *transcoder_selection = NULL;
+#if 0 /* INITIAL_DIRECTORY_OPTION */
 static gchar *initial_dir = NULL;
+#endif
 
 static GOptionEntry optionentries[] = {
   { "burn-image", 'i', G_OPTION_FLAG_OPTIONAL_ARG /* || G_OPTION_FLAG_FILENAME */, G_OPTION_ARG_CALLBACK, &parse_option, 
-    "Open the burn image dialog. The filename of the image can optionally be specified as a parameter", NULL },
+    "Open the burn image dialog, optionally followed by the image filename", NULL },
   { "blank", 'b', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, &parse_option, 
-    "Open the blank disc dialog.", NULL },
+    "Open the blank disc dialog", NULL },
   { "data-composition", 'd', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, &parse_option, 
-    "Start a data composition. Optionally followed by files/directories to be added to the composition.", NULL },
+    "Start a data composition, optionally followed by files/directories to be added to the composition", NULL },
   { "audio-composition", 'a', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, &parse_option, 
-    "Start an audio composition. Optionally followed by files/directories to be added to the composition.", NULL },
+    "Start an audio composition, optionally followed by files/directories to be added to the composition", NULL },
   { "transcoder", 't', 0, G_OPTION_ARG_STRING, &transcoder_selection, 
-    "Select the transcoder. Run with --transcoder=list to see the available ones.", NULL },
-/* not yet implemented 
+    "Select the transcoder, run with --transcoder=list to see the available ones", NULL },
+#if 0 /* INITIAL_DIRECTORY_OPTION */
+/* Implementing this does not seem worth the effort */
   { "directory", 'D', G_OPTION_FLAG_OPTIONAL_ARG , G_OPTION_ARG_CALLBACK, &parse_option, 
-    "Open the burn image dialog. The filename of the image can optionally be specified as a parameter", NULL },
-*/
+    "Start the file browser in the specified directory, or the current directory if none is specified (the default is to start in your home directory)", NULL },
+#endif
   { "version", 'V', G_OPTION_FLAG_NO_ARG , G_OPTION_ARG_NONE, &show_version, 
     "Display program version and exit", NULL },
   { "main", 'm', G_OPTION_FLAG_NO_ARG , G_OPTION_ARG_NONE, &show_main, 
@@ -123,6 +126,7 @@
   window_counter = -42;
 }
 
+#if 0 /* INITIAL_DIRECTORY_OPTION */
 const gchar *
 xfburn_main_get_initial_dir ()
 {
@@ -131,6 +135,7 @@
   else
     return xfce_get_homedir ();
 }
+#endif
 
 
 /* private functions */
@@ -149,11 +154,13 @@
     add_audio_composition = TRUE;
   } else if (strcmp (option_name, "-b") == 0 || strcmp (option_name, "--blank") == 0) {
     blank = TRUE;
+#if 0 /* INITIAL_DIRECTORY_OPTION */
   } else if (strcmp (option_name, "-D") == 0 || strcmp (option_name, "--directory") == 0) {
     if (value == NULL)
       initial_dir = g_get_current_dir ();
     else
       initial_dir = g_strdup(value);
+#endif
   } else {
     g_set_error (error, 0, G_OPTION_ERROR_FAILED, "Invalid command line option. Please report, this is a bug.");
     return FALSE;

Modified: xfburn/trunk/xfburn/xfburn-main.h
===================================================================
--- xfburn/trunk/xfburn/xfburn-main.h	2008-11-11 07:20:19 UTC (rev 6061)
+++ xfburn/trunk/xfburn/xfburn-main.h	2008-11-11 20:28:24 UTC (rev 6062)
@@ -28,7 +28,9 @@
 
 void xfburn_main_leave_window ();
 void xfburn_main_enter_window ();
+#if 0 /* INITIAL_DIRECTORY_OPTION */
 const gchar *xfburn_main_get_initial_dir ();
+#endif
 
 G_END_DECLS
 #endif /* __XFBURN_MAIN_H__ */