[Gnucash-changes] Further gnome2 porting of dialogs.
Christian Stimming
cstim at cvs.gnucash.org
Sun Oct 9 08:04:42 EDT 2005
Log Message:
-----------
Further gnome2 porting of dialogs.
2005-10-09 Christian Stimming <stimming at tuhh.de>
* src/import-export/hbci/hbci-interaction.c: Further gnome2
porting of dialogs.
Tags:
----
gnucash-gnome2-dev
Modified Files:
--------------
gnucash:
ChangeLog
gnucash/src/import-export/hbci:
hbci-interaction.c
Revision Data
-------------
Index: ChangeLog
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/ChangeLog,v
retrieving revision 1.1487.2.321
retrieving revision 1.1487.2.322
diff -LChangeLog -LChangeLog -u -r1.1487.2.321 -r1.1487.2.322
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,8 @@
+2005-10-09 Christian Stimming <stimming at tuhh.de>
+
+ * src/import-export/hbci/hbci-interaction.c: Further gnome2
+ porting of dialogs.
+
2005-10-08 David Hampton <hampton at employees.org>
* src/app-utils/Makefile.am:
Index: hbci-interaction.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/hbci/hbci-interaction.c,v
retrieving revision 1.16.4.20
retrieving revision 1.16.4.21
diff -Lsrc/import-export/hbci/hbci-interaction.c -Lsrc/import-export/hbci/hbci-interaction.c -u -r1.16.4.20 -r1.16.4.21
--- src/import-export/hbci/hbci-interaction.c
+++ src/import-export/hbci/hbci-interaction.c
@@ -541,34 +541,39 @@
b2text = gnc_hbci_utf8ToLatin1(data, b2);
b3text = gnc_hbci_utf8ToLatin1(data, b3);
- dialog = gnome_dialog_new (title,
- b1 ? b1text : NULL,
- b2 ? b2text : NULL,
- b3 ? b3text : NULL,
- NULL);
- gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (data->parent));
- gnome_dialog_set_close (GNOME_DIALOG (dialog), TRUE);
+ dialog = gtk_dialog_new_with_buttons (title,
+ GTK_WINDOW (data->parent),
+ GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+ b1 ? b1text : NULL,
+ 1,
+ b2 ? b2text : NULL,
+ 2,
+ b3 ? b3text : NULL,
+ 3,
+ NULL);
+ /* Ensure that the dialog box is destroyed when the user responds. */
+ g_signal_connect_swapped (dialog,
+ "response",
+ G_CALLBACK (gtk_widget_destroy),
+ dialog);
+ /* Add the label, and show everything we've added to the dialog. */
label = gtk_label_new (text);
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), label, TRUE, TRUE, 0);
- gtk_widget_show (label);
+ gtk_container_add (GTK_CONTAINER (GTK_DIALOG(dialog)->vbox),
+ label);
+ gtk_widget_show_all (dialog);
- result = gnome_dialog_run (GNOME_DIALOG (dialog));
- if (result<0 || result>2) {
+ result = gtk_dialog_run (GTK_DIALOG (dialog));
+ if (result<1 || result>3) {
printf("messageBoxCB: Bad result %d", result);
- g_free(title);
- g_free(text);
- g_free(b1text);
- g_free(b2text);
- g_free(b3text);
- return 0;
+ result = 0;
}
g_free(title);
g_free(text);
g_free(b1text);
g_free(b2text);
g_free(b3text);
- return result+1;
+ return result;
}
More information about the gnucash-changes
mailing list