[epiphany/gnome-2-30] Revert "pdm-dialog: nasty hack to compile with GSEAL enabled"
- From: Diego Escalante Urrelo <diegoe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany/gnome-2-30] Revert "pdm-dialog: nasty hack to compile with GSEAL enabled"
- Date: Mon, 30 Aug 2010 23:14:21 +0000 (UTC)
commit fef8d23fb16d053f81f6ae35dc9c20dc6a258ea9
Author: Diego Escalante Urrelo <descalante igalia com>
Date: Mon Aug 30 17:30:35 2010 -0500
Revert "pdm-dialog: nasty hack to compile with GSEAL enabled"
This reverts commit 197e75e719b3be263be7a4d3c8764c4fb15ada19.
src/pdm-dialog.c | 22 ++--------------------
1 files changed, 2 insertions(+), 20 deletions(-)
---
diff --git a/src/pdm-dialog.c b/src/pdm-dialog.c
index 8637a0b..ce7f7e3 100644
--- a/src/pdm-dialog.c
+++ b/src/pdm-dialog.c
@@ -351,25 +351,13 @@ clear_all_dialog_checkbutton_toggled_cb (GtkToggleButton *toggle,
data->num_checked != 0);
}
-static GtkWidget*
-_gtk_message_dialog_get_content_area (GtkMessageDialog *dialog)
-{
- GtkWidget *image, *parent;
- GList *children;
-
- image = gtk_message_dialog_get_image (dialog);
- parent = gtk_widget_get_parent (image);
- children = gtk_container_get_children (GTK_CONTAINER (parent));
- return GTK_WIDGET (children->next->data);
-}
-
void
pdm_dialog_show_clear_all_dialog (EphyDialog *edialog,
GtkWidget *parent,
PdmClearAllDialogFlags flags)
{
GtkWidget *dialog, *vbox;
- GtkWidget *check, *label, *content_area;
+ GtkWidget *check, *label;
PdmClearAllDialogButtons *checkbuttons;
GtkWidget *button, *icon;
@@ -405,17 +393,11 @@ pdm_dialog_show_clear_all_dialog (EphyDialog *edialog,
gtk_dialog_set_default_response (GTK_DIALOG (dialog),
GTK_RESPONSE_CANCEL);
-#if 0
gtk_label_set_selectable (GTK_LABEL (GTK_MESSAGE_DIALOG (dialog)->label),
FALSE);
-#endif
vbox = gtk_vbox_new (FALSE, 6);
- /* This is extremely evil, but at least we'll compile with
- * GSEAL enabled until #328069 is resolved. If it's WONTFIXED
- * we'll just do this from scratch with a normal GtkDialog */
- content_area = _gtk_message_dialog_get_content_area (GTK_MESSAGE_DIALOG (dialog));
- gtk_box_pack_start (GTK_BOX (content_area),
+ gtk_box_pack_start (GTK_BOX (GTK_MESSAGE_DIALOG (dialog)->label->parent),
vbox, FALSE, FALSE, 0);
checkbuttons = g_slice_new0 (PdmClearAllDialogButtons);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]