[Gnucash-changes] 2005-07-24 Christian Stimming <stimming@tuhh.de>
*
Christian Stimming
cstim at cvs.gnucash.org
Sun Jul 24 16:53:27 EDT 2005
Log Message:
-----------
2005-07-24 Christian Stimming <stimming at tuhh.de>
* src/import-export/hbci/dialog-pass.c, gnc-hbci-utils.c,
hbci-interaction.c, glade/hbcipass.glade: Fix transition from
GNOME_DIALOG to GTK_DIALOG. Eventually enable HBCI online actions
again. Needs more work but at least contacts the bank correctly.
Tags:
----
gnucash-gnome2-dev
Modified Files:
--------------
gnucash:
ChangeLog
gnucash/src/import-export/hbci:
dialog-pass.c
gnc-hbci-utils.c
hbci-interaction.c
gnucash/src/import-export/hbci/glade:
hbcipass.glade
Revision Data
-------------
Index: ChangeLog
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/ChangeLog,v
retrieving revision 1.1487.2.248
retrieving revision 1.1487.2.249
diff -LChangeLog -LChangeLog -u -r1.1487.2.248 -r1.1487.2.249
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,10 @@
+2005-07-24 Christian Stimming <stimming at tuhh.de>
+
+ * src/import-export/hbci/dialog-pass.c, gnc-hbci-utils.c,
+ hbci-interaction.c, glade/hbcipass.glade: Fix transition from
+ GNOME_DIALOG to GTK_DIALOG. Eventually enable HBCI online actions
+ again. Needs more work but at least contacts the bank correctly.
+
2005-07-23 David Hampton <hampton at employees.org>
* src/gnome-utils/druid-gconf-setup.c: Use $(HOME) instead of '~'
Index: hbci-interaction.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/hbci/hbci-interaction.c,v
retrieving revision 1.16.4.11
retrieving revision 1.16.4.12
diff -Lsrc/import-export/hbci/hbci-interaction.c -Lsrc/import-export/hbci/hbci-interaction.c -u -r1.16.4.11 -r1.16.4.12
--- src/import-export/hbci/hbci-interaction.c
+++ src/import-export/hbci/hbci-interaction.c
@@ -209,7 +209,7 @@
gtk_widget_reparent (GTK_WIDGET (i->dialog), new_parent);
else
gtk_widget_set_parent (GTK_WIDGET (i->dialog), new_parent);*/
- gnome_dialog_set_parent (GNOME_DIALOG (i->dialog),
+ gtk_window_set_transient_for (GTK_WINDOW (i->dialog),
GTK_WINDOW (new_parent));
}
}
@@ -342,6 +342,7 @@
if (!retval)
break;
+ g_assert(passwd);
if (strlen(passwd) < (unsigned int)minsize) {
gboolean retval;
char *msg =
@@ -484,7 +485,7 @@
dialog = data->showbox_last;
}
if (dialog) {
- gnome_dialog_close (GNOME_DIALOG (dialog));
+ gtk_widget_hide (dialog);
gtk_widget_destroy (dialog);
g_hash_table_remove(data->showbox_hash, (gpointer)id);
}
@@ -552,14 +553,14 @@
b2 ? b2text : NULL,
b3 ? b3text : NULL,
NULL);
- gnome_dialog_set_parent (GNOME_DIALOG (dialog), GTK_WINDOW (data->parent));
+ gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (data->parent));
gnome_dialog_set_close (GNOME_DIALOG (dialog), TRUE);
label = gtk_label_new (text);
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
- gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), label, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), label, TRUE, TRUE, 0);
gtk_widget_show (label);
- result = gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
+ result = gnome_dialog_run (GNOME_DIALOG (dialog));
if (result<0 || result>2) {
printf("messageBoxCB: Bad result %d", result);
g_free(title);
@@ -772,7 +773,7 @@
GTK_SIGNAL_FUNC (on_button_clicked), data);
if (data->parent)
- gnome_dialog_set_parent (GNOME_DIALOG (dialog), GTK_WINDOW (data->parent));
+ gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (data->parent));
/*gtk_widget_set_parent (GTK_WIDGET (dialog), data->parent);*/
gtk_object_ref (GTK_OBJECT (dialog));
Index: gnc-hbci-utils.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/hbci/gnc-hbci-utils.c,v
retrieving revision 1.23.4.9
retrieving revision 1.23.4.10
diff -Lsrc/import-export/hbci/gnc-hbci-utils.c -Lsrc/import-export/hbci/gnc-hbci-utils.c -u -r1.23.4.9 -r1.23.4.10
--- src/import-export/hbci/gnc-hbci-utils.c
+++ src/import-export/hbci/gnc-hbci-utils.c
@@ -921,7 +921,7 @@
#if HAVE_LANGINFO_CODESET
char* encoding = nl_langinfo(CODESET);
#else
- char* encoding = "ISO8859-15";
+ char* encoding = "UTF-8";
#endif
return encoding;
}
Index: dialog-pass.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/hbci/dialog-pass.c,v
retrieving revision 1.3.4.3
retrieving revision 1.3.4.4
diff -Lsrc/import-export/hbci/dialog-pass.c -Lsrc/import-export/hbci/dialog-pass.c -u -r1.3.4.3 -r1.3.4.4
--- src/import-export/hbci/dialog-pass.c
+++ src/import-export/hbci/dialog-pass.c
@@ -50,16 +50,15 @@
dialog = glade_xml_get_widget (xml, "Password Dialog");
if (parent)
- gnome_dialog_set_parent (GNOME_DIALOG (dialog), GTK_WINDOW (parent));
+ gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent));
heading_label = glade_xml_get_widget (xml, "heading_label");
password_entry = glade_xml_get_widget (xml, "password_entry");
g_assert(heading_label && password_entry);
- gnome_dialog_set_default (GNOME_DIALOG (dialog), 0);
+ gtk_dialog_set_default_response (GTK_DIALOG (dialog), 1);
- gnome_dialog_editable_enters (GNOME_DIALOG (dialog),
- GTK_EDITABLE (password_entry));
+ gtk_entry_set_activates_default (GTK_ENTRY (password_entry), TRUE);
if (windowtitle)
gtk_window_set_title (GTK_WINDOW (dialog), windowtitle);
@@ -72,13 +71,14 @@
gtk_entry_set_visibility (GTK_ENTRY (password_entry), !hide_input);
result = gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy(dialog);
- if (result == GTK_RESPONSE_OK)
+ if (result == 1) /* the hand-assigned response value */
{
- *password = gtk_editable_get_chars (GTK_EDITABLE (password_entry), 0, -1);
+ *password = g_strdup (gtk_entry_get_text (GTK_ENTRY (password_entry)) );
+ gtk_widget_destroy(dialog);
return TRUE;
}
+ gtk_widget_destroy(dialog);
*password = NULL;
return FALSE;
@@ -105,19 +105,17 @@
dialog = glade_xml_get_widget (xml, "Initial Password Dialog");
if (parent)
- gnome_dialog_set_parent (GNOME_DIALOG (dialog), GTK_WINDOW (parent));
+ gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent));
heading_label = glade_xml_get_widget (xml, "heading_label");
password_entry = glade_xml_get_widget (xml, "password_entry");
confirm_entry = glade_xml_get_widget (xml, "confirm_entry");
g_assert(heading_label && password_entry && confirm_entry);
- gnome_dialog_set_default (GNOME_DIALOG (dialog), 0);
+ gtk_dialog_set_default_response (GTK_DIALOG (dialog), 1);
- gnome_dialog_editable_enters (GNOME_DIALOG (dialog),
- GTK_EDITABLE (password_entry));
- gnome_dialog_editable_enters (GNOME_DIALOG (dialog),
- GTK_EDITABLE (confirm_entry));
+ gtk_entry_set_activates_default (GTK_ENTRY (password_entry), FALSE);
+ gtk_entry_set_activates_default (GTK_ENTRY (confirm_entry), TRUE);
if (windowtitle)
gtk_window_set_title (GTK_WINDOW (dialog), windowtitle);
@@ -128,20 +126,15 @@
while (TRUE) {
result = gtk_dialog_run (GTK_DIALOG (dialog));
- if (result == GTK_RESPONSE_OK)
+ if (result == 1) /* the hand-assigned response value */
{
- char *pw, *confirm;
- pw = gtk_editable_get_chars (GTK_EDITABLE (password_entry), 0, -1);
- confirm = gtk_editable_get_chars (GTK_EDITABLE (confirm_entry),
- 0, -1);
+ const char *pw = gtk_entry_get_text (GTK_ENTRY (password_entry));
+ const char *confirm = gtk_entry_get_text (GTK_ENTRY (confirm_entry));
if (strcmp (pw, confirm) == 0) {
- *password = pw;
- g_free (confirm);
+ *password = g_strdup(pw);
gtk_widget_destroy (GTK_WIDGET (dialog));
return TRUE;
}
- g_free (pw);
- g_free (confirm);
}
else
break;
Index: hbcipass.glade
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/hbci/glade/hbcipass.glade,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -Lsrc/import-export/hbci/glade/hbcipass.glade -Lsrc/import-export/hbci/glade/hbcipass.glade -u -r1.1.4.4 -r1.1.4.5
--- src/import-export/hbci/glade/hbcipass.glade
+++ src/import-export/hbci/glade/hbcipass.glade
@@ -39,7 +39,7 @@
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
- <property name="response_id">-6</property>
+ <property name="response_id">2</property>
</widget>
</child>
@@ -53,7 +53,7 @@
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
- <property name="response_id">-5</property>
+ <property name="response_id">1</property>
</widget>
</child>
</widget>
@@ -188,7 +188,7 @@
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
- <property name="response_id">-6</property>
+ <property name="response_id">2</property>
</widget>
</child>
@@ -202,7 +202,7 @@
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
- <property name="response_id">-5</property>
+ <property name="response_id">1</property>
</widget>
</child>
</widget>
More information about the gnucash-changes
mailing list