Index: main.c
===================================================================
--- main.c	(revision 24209)
+++ main.c	(working copy)
@@ -181,7 +181,7 @@
 	} else
 		cb_file_new(sd);
 	
-/*	dnd_init(sd->mainwin->window); */
+//	dnd_init(sd->mainwin->window);
 	dnd_init(sd->mainwin->textview);
 	keyevent_init(sd->mainwin->textview);
 
@@ -211,20 +211,30 @@
 */	
 	gtk_init(&argc, &argv);
 	
-	if (argv[1]) {
-		if (g_strstr_len(argv[1], 5, "file:")) {
-			filename = g_filename_from_uri(argv[1], NULL, NULL);
-			if (g_strrstr(filename, " ")) {
-				strs = g_strsplit(filename, " ", -1);
-				g_free(filename);
-				filename = g_strjoinv("\\ ", strs);
-				g_strfreev(strs);
+	if (argc > 1) {
+		if (argv[1]) {
+			if (g_strstr_len(argv[1], 6, "--help")) {
+				printf("Usage:\n\tmousepad [FILE] [ARGS]\n");
+				return 0;
 			}
-		} else {
-		/*	if  (!g_path_is_absolute(argv[1]))
-				filename = g_build_filename(g_get_current_dir(), argv[1], NULL);
-			else */
-				filename = g_strdup(argv[1]);
+			if (g_strstr_len(argv[1], 9, "--version")) {
+				printf("Version 0.2.10\n");
+				return 0;
+			}
+			if (g_strstr_len(argv[1], 5, "file:")) {
+				filename = g_filename_from_uri(argv[1], NULL, NULL);
+				if (g_strrstr(filename, " ")) {
+					strs = g_strsplit(filename, " ", -1);
+					g_free(filename);
+					filename = g_strjoinv("\\ ", strs);
+					g_strfreev(strs);
+				}
+			} else {
+			/*	if  (!g_path_is_absolute(argv[1]))
+					filename = g_build_filename(g_get_current_dir(), argv[1], NULL);
+				else */
+					filename = g_strdup(argv[1]);
+			}
 		}
 	}