[Gpa-commits] r946 - in trunk: . src

[scm-commit@wald.intevation.org]

Author: werner
Date: 2009-02-10 13:46:49 +0100 (Tue, 10 Feb 2009)
New Revision: 946

Modified:
   trunk/TODO
   trunk/src/ChangeLog
   trunk/src/cardman.c
Log:
Disabled new code due to the use of newer GTK+ functions.


Modified: trunk/TODO
===================================================================
--- trunk/TODO	2009-02-07 22:17:37 UTC (rev 945)
+++ trunk/TODO	2009-02-10 12:46:49 UTC (rev 946)
@@ -80,6 +80,10 @@
 ** Not all users know about ctrl+click to select multiple items from a list.
    Use check boxes, or add instructions, or otherwise make this
    easier.
+
+   - Or print a hint in the status bar the first time something is
+     selected.  Such hints helped me a lot to get acquainted with JOSM [wk].
+
 ** The keyring editor has a pop up if there is no default key that says
    that the user has no private key.  But the user can have a private key.
    Either fix the message or the check.

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2009-02-07 22:17:37 UTC (rev 945)
+++ trunk/src/ChangeLog	2009-02-10 12:46:49 UTC (rev 946)
@@ -1,3 +1,8 @@
+2009-02-10  Werner Koch  <wk at g10code.com>
+
+	* cardman.c (modify_name_cb): Disabled due to the use of new gtk+
+	functions.
+
 2009-02-07  Moritz  <moritz at gnu.org>
 
 	* cardman.c (card_genkey): Fix typo in message.

Modified: trunk/src/cardman.c
===================================================================
--- trunk/src/cardman.c	2009-02-07 22:17:37 UTC (rev 945)
+++ trunk/src/cardman.c	2009-02-10 12:46:49 UTC (rev 946)
@@ -811,6 +811,9 @@
 /* Action for "Change Name" button.  Display a new dialog through
    which the user can change the name (firstname + lastname) stored on
    the card. */
+/* FIXME: gtl_dialog_get_content_area is a newer GTK feature.  We
+   can't use it.  Thus this function is disabled.  */
+#if 0
 static void
 modify_name_cb (GtkWidget *widget, gpointer data)
 {
@@ -822,6 +825,7 @@
   GtkWidget *entryLastName;
   gint result;
   
+
   dialog = gtk_dialog_new_with_buttons ("Change Name",
 					GTK_WINDOW (cardman),
 					GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -837,27 +841,35 @@
   gtk_container_set_border_width (GTK_CONTAINER (table), 10);
 
   gtk_table_attach (GTK_TABLE (table),
-		    gtk_label_new ("Current Value:"), 0, 1, 1, 2, GTK_FILL, GTK_SHRINK, 0, 0);
+		    gtk_label_new ("Current Value:"), 
+                    0, 1, 1, 2, GTK_FILL, GTK_SHRINK, 0, 0);
   gtk_table_attach (GTK_TABLE (table),
-		    gtk_label_new ("New Value:"), 0, 1,  2, 3, GTK_FILL, GTK_SHRINK, 0, 0);
+		    gtk_label_new ("New Value:"), 
+                    0, 1,  2, 3, GTK_FILL, GTK_SHRINK, 0, 0);
 
   gtk_table_attach (GTK_TABLE (table),
-		    gtk_label_new ("First Name"), 1,  2, 0, 1, GTK_FILL, GTK_SHRINK, 0, 0);
+		    gtk_label_new ("First Name"),
+                    1,  2, 0, 1, GTK_FILL, GTK_SHRINK, 0, 0);
   gtk_table_attach (GTK_TABLE (table),
-		    gtk_label_new ("Last Name"), 2,  3, 0, 1, GTK_FILL, GTK_SHRINK, 0, 0);
+		    gtk_label_new ("Last Name"),
+                    2,  3, 0, 1, GTK_FILL, GTK_SHRINK, 0, 0);
 
   gtk_table_attach (GTK_TABLE (table),
-		    gtk_label_new (gtk_entry_get_text (GTK_ENTRY (cardman->entryFirstName))),
+		    gtk_label_new (gtk_entry_get_text 
+                                   (GTK_ENTRY (cardman->entryFirstName))),
 		    1, 2, 1, 2, GTK_FILL, GTK_SHRINK, 0, 0);
   gtk_table_attach (GTK_TABLE (table),
-		    gtk_label_new (gtk_entry_get_text (GTK_ENTRY (cardman->entryLastName))),
+		    gtk_label_new (gtk_entry_get_text 
+                                   (GTK_ENTRY (cardman->entryLastName))),
 		    2, 3, 1, 2, GTK_FILL, GTK_SHRINK, 0, 0);
 
   entryFirstName = new_gtk_entry (NULL, FALSE);
   entryLastName = new_gtk_entry (NULL, FALSE);
 
-  gtk_table_attach (GTK_TABLE (table), entryFirstName, 1, 2, 2, 3, GTK_FILL, GTK_SHRINK, 0, 0);
-  gtk_table_attach (GTK_TABLE (table), entryLastName, 2, 3, 2, 3, GTK_FILL, GTK_SHRINK, 0, 0);
+  gtk_table_attach (GTK_TABLE (table), entryFirstName, 
+                    1, 2, 2, 3, GTK_FILL, GTK_SHRINK, 0, 0);
+  gtk_table_attach (GTK_TABLE (table), entryLastName,
+                    2, 3, 2, 3, GTK_FILL, GTK_SHRINK, 0, 0);
 
   gtk_container_add (GTK_CONTAINER (content_area), table);
   gtk_widget_show_all (dialog);
@@ -866,8 +878,10 @@
   switch (result)
     {
     case GTK_RESPONSE_ACCEPT:
-      fprintf (stderr, "NOT IMPLEMENTED YET, CHANGING NAME to \"%s\", \"%s\"...\n",
-	       gtk_entry_get_text (GTK_ENTRY (entryFirstName)), gtk_entry_get_text (GTK_ENTRY (entryLastName)));
+      fprintf (stderr, "NOT IMPLEMENTED YET, "
+               "CHANGING NAME to \"%s\", \"%s\"...\n",
+	       gtk_entry_get_text (GTK_ENTRY (entryFirstName)), 
+               gtk_entry_get_text (GTK_ENTRY (entryLastName)));
       break;
 
     default:
@@ -878,6 +892,7 @@
   gtk_widget_destroy (entryLastName);
   gtk_widget_destroy (dialog);
 }
+#endif /* Disabled code.  */
 
 
 /* This function constructs the container holding the card "form". It
@@ -974,8 +989,9 @@
 
     modify_name_button = gtk_button_new_with_label ("Change");
 
-    g_signal_connect (G_OBJECT (modify_name_button), "clicked",
-		      G_CALLBACK (modify_name_cb), cardman);
+    /* Disabled because we need to change modify_name_cb first.  */
+/*     g_signal_connect (G_OBJECT (modify_name_button), "clicked", */
+/* 		      G_CALLBACK (modify_name_cb), cardman); */
     add_table_row (personal_table, &rowidx,
 		   "Last Name:", cardman->entryLastName, modify_name_button);
   }