kov changed gksu/branches/gksu2/ChangeLog, gksu/branches/gksu2/gksu/gksu.c

[Gustavo Noronha]

Mensagem de log: 
ignore -i and -t, reimplemented -m using functionality
that has just been added to libgksu2


-----


Modified: gksu/branches/gksu2/ChangeLog
===================================================================
--- gksu/branches/gksu2/ChangeLog	2006-04-25 02:06:11 UTC (rev 571)
+++ gksu/branches/gksu2/ChangeLog	2006-04-25 02:13:28 UTC (rev 572)
@@ -1,5 +1,9 @@
 2006-04-24  Gustavo Noronha Silva  <kov at debian.org>
 
+	* gksu/gksu.c:
+	- ignore -i and -t, reimplemented -m using functionality
+	  that has just been added to libgksu2
+
 	* Release 1.9.0
 
 2006-04-23  Gustavo Noronha Silva  <kov at debian.org>

Modified: gksu/branches/gksu2/gksu/gksu.c
===================================================================
--- gksu/branches/gksu2/gksu/gksu.c	2006-04-25 02:06:11 UTC (rev 571)
+++ gksu/branches/gksu2/gksu/gksu.c	2006-04-25 02:13:28 UTC (rev 572)
@@ -25,7 +25,6 @@
 gboolean print_pass = FALSE;
 gboolean force_grab = FALSE;
 gboolean sudo_mode = FALSE;
-gboolean message_changed = FALSE;
 gboolean prompt = FALSE;
 
 struct option long_opts[] = {
@@ -72,8 +71,6 @@
        "    Disable the \"locking\" of the keyboard, mouse,\n"
        "    and focus done by the program when asking for\n"
        "    password.\n"),
-    N_("  --icon <icon>, -i <icon>\n"
-       "    Replace the default window icon with the argument.\n"),
     N_("  --message <message>, -m <message>\n"
        "    Replace the standard message shown to ask for\n"
        "    password for the argument passed to the option.\n"),
@@ -91,13 +88,11 @@
     N_("  --sudo-mode, -S\n"
        "    Make GKSu use sudo instead of su, as if it had been\n"
        "    run as \"gksudo\".\n"),
-    N_("  --title <title>, -t <title>\n"
-       "    Replace the default title with the argument.\n"),
     N_("  --user <user>, -u <user>\n"
        "    Call <command> as the specified user.\n"),
     N_("  --desktop <file>, -D <file>\n"
        "    Use a .desktop file to get the name of the application\n"
-       "    and the icon from.\n"
+       "    from.\n"
        "\n"),
     N_("  --preserve-env, -k\n"
        "    Preserve the current environments, does not set $HOME\n"
@@ -164,9 +159,7 @@
   gint newargc = 0;
   gchar **newargv = NULL;
 
-  gchar *title = NULL, *message = NULL;
   gchar *desktop_file_name = NULL;
-  GdkPixbuf *icon = NULL;
 
   int c = 0;
 
@@ -233,19 +226,9 @@
 	  /* FIXME - reimplement */
 	  print_pass = TRUE;
 	  break;
-	case 't':
-	  /* FIXME - reimplement */
-	  title = g_strdup (optarg);
-	  break;
 	case 'm':
-	  /* FIXME - reimplement */
-	  message = g_strdup (optarg);
-	  message_changed = TRUE;
+	  gksu_context_set_message (context, optarg);
 	  break;
-	case 'i':
-	  /* FIXME - reimplement */
-	  icon = gdk_pixbuf_new_from_file (optarg, NULL);
-	  break;
 	case 'k':
 	  gksu_context_set_keep_env (context, TRUE);
 	  break;