← Back to branch summary

~ubuntu-branches/ubuntu/raring/xiphos/raring

« back to all changes in this revision

Viewing changes to src/gnome2/dialog.c

  • Committer: Bazaar Package Importer
  • Author(s): Dmitrijs Ledkovs, Jonathan Marsden, Dmitrijs Ledkovs
  • Date: 2010-11-25 21:26:48 UTC
  • mfrom: (2.1.1 experimental)
  • Revision ID: james.westby@ubuntu.com-20101125212648-mc64wvs0nw3xp7bx
Tags: 3.1.4-1
[ Jonathan Marsden ]
* New upstream release 3.1.4
* Removed debian/patch/* since the one patch was included upstream.
* Bumped Standards-Version to 3.9.1 (no changes required).
* debian/README.Debian: Corrected spelling and reworded for clarity.
* debian/control: Add Jonathan Marsden back into Uploaders.

[ Dmitrijs Ledkovs ]
* Added local options dpkg-source to unapply patches and fail on
  upstream source changes (ignoring false positives).
* Added bzr-builddeb hook to generate source-format before build. If you
  are not using bzr-builddeb, you must run "./debian/rules clean" before
  building.
* patches/xul-2.0.patch: bump UPPER_RANGE to allow running against xul20.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gnome2/dialog.c
2
2
 * Xiphos Bible Study Tool
3
3
 * dialog.c -
4
4
 *
5
 
 * Copyright (C) 2000-2009 Xiphos Developer Team
 
5
 * Copyright (C) 2000-2010 Xiphos Developer Team
6
6
 *
7
7
 * This program is free software; you can redistribute it and/or modify
8
8
 * it under the terms of the GNU General Public License as published by
123
123
 
124
124
static void on_dialog_response(GtkDialog * dialog, gint response_id, GS_DIALOG * info)
125
125
{
126
 
        GS_warning(("%d", response_id));
127
126
        switch (response_id) {
128
127
        case GTK_RESPONSE_OK:
129
128
                retval = GS_OK;
187
186
        //gtk_window_set_resizable(GTK_WINDOW(dialog_alert), FALSE);
188
187
        gtk_dialog_set_has_separator(GTK_DIALOG(dialog_alert), FALSE);
189
188
 
190
 
        dialog_vbox2 = GTK_DIALOG(dialog_alert)->vbox;
 
189
        dialog_vbox2 = gtk_dialog_get_content_area(GTK_DIALOG(dialog_alert));
191
190
        gtk_widget_show(dialog_vbox2);
192
191
 
193
192
        hbox3 = gtk_hbox_new(FALSE, 12);
238
237
                gtk_misc_set_alignment(GTK_MISC(label10), 0, 0.5);
239
238
        }
240
239
 
241
 
        dialog_action_area2 = GTK_DIALOG(dialog_alert)->action_area;
 
240
        dialog_action_area2 = gtk_dialog_get_action_area(GTK_DIALOG(dialog_alert));
242
241
        gtk_widget_show(dialog_action_area2);
243
242
        gtk_button_box_set_layout(GTK_BUTTON_BOX(dialog_action_area2),
244
243
                                  GTK_BUTTONBOX_END);
313
312
        gtk_window_set_resizable(GTK_WINDOW(dialog_request), FALSE);
314
313
        gtk_dialog_set_has_separator(GTK_DIALOG(dialog_request), FALSE);
315
314
 
316
 
        dialog_vbox3 = GTK_DIALOG(dialog_request)->vbox;
 
315
        dialog_vbox3 = gtk_dialog_get_content_area(GTK_DIALOG(dialog_request));
317
316
        gtk_widget_show(dialog_vbox3);
318
317
 
319
318
        hbox4 = gtk_hbox_new(FALSE, 12);
487
486
                                 G_CALLBACK(on_dialog_enter), info);
488
487
        }
489
488
 
490
 
        dialog_action_area3 = GTK_DIALOG(dialog_request)->action_area;
 
489
        dialog_action_area3 = gtk_dialog_get_action_area(GTK_DIALOG(dialog_request));
491
490
        gtk_widget_show(dialog_action_area3);
492
491
        gtk_button_box_set_layout(GTK_BUTTON_BOX(dialog_action_area3),
493
492
                                  GTK_BUTTONBOX_END);
534
533
{
535
534
        standard_info = g_new0(GS_DIALOG, 1);
536
535
 
537
 
        standard_info->stock_icon = NULL;
538
 
        standard_info->dialog = NULL;
539
 
        standard_info->title = NULL;
540
 
        standard_info->text1 = NULL;
541
 
        standard_info->text2 = NULL;
542
 
        standard_info->text3 = NULL;
543
 
        standard_info->text4 = NULL;
544
 
        standard_info->text5 = NULL;
545
 
        standard_info->text6 = NULL;
546
 
        standard_info->label_top = NULL;
547
 
        standard_info->label_middle = NULL;
548
 
        standard_info->label1 = NULL;
549
 
        standard_info->label2 = NULL;
550
 
        standard_info->label3 = NULL;
551
 
        standard_info->label4 = NULL;
552
 
        standard_info->label5 = NULL;
553
 
        standard_info->label6 = NULL;
554
 
        standard_info->label_bottom = NULL;
555
 
        standard_info->ok = FALSE;
556
 
        standard_info->cancel = FALSE;
557
 
        standard_info->yes = FALSE;
558
 
        standard_info->no = FALSE;
559
536
        /* set entrys to null */
560
537
        entry1 = NULL;
561
538
        entry2 = NULL;