GNOME.org
 

[gnome-disk-utility] Compile against latest gtk+

commit f95e196486083b0741b7b06748af18c810b4b51e
Author: Jonh Wendell <jwendell gnome org>
Date:   Tue Sep 14 16:11:59 2010 -0300

    Compile against latest gtk+

 src/format-tool/gdu-format-progress-dialog.c    |    1 -
 src/gdu-gtk/gdu-add-component-linux-md-dialog.c |    1 -
 src/gdu-gtk/gdu-add-pv-linux-lvm2-dialog.c      |    1 -
 src/gdu-gtk/gdu-ata-smart-dialog.c              |    2 --
 src/gdu-gtk/gdu-confirmation-dialog.c           |    1 -
 src/gdu-gtk/gdu-connect-to-server-dialog.c      |    1 -
 src/gdu-gtk/gdu-create-linux-md-dialog.c        |    1 -
 src/gdu-gtk/gdu-drive-benchmark-dialog.c        |    2 --
 src/gdu-gtk/gdu-edit-linux-lvm2-dialog.c        |    1 -
 src/gdu-gtk/gdu-edit-linux-md-dialog.c          |    1 -
 src/gdu-gtk/gdu-edit-name-dialog.c              |    1 -
 src/gdu-gtk/gdu-edit-partition-dialog.c         |    1 -
 src/gdu-gtk/gdu-error-dialog.c                  |    1 -
 src/gdu-gtk/gdu-format-dialog.c                 |    1 -
 src/gdu-gtk/gdu-partition-dialog.c              |    1 -
 src/gdu-gtk/gdu-volume-grid.c                   |    2 +-
 src/notification/gdu-slow-unmount-dialog.c      |    2 --
 17 files changed, 1 insertions(+), 20 deletions(-)
---
diff --git a/src/format-tool/gdu-format-progress-dialog.c b/src/format-tool/gdu-format-progress-dialog.c
index 673496a..02e80a1 100644
--- a/src/format-tool/gdu-format-progress-dialog.c
+++ b/src/format-tool/gdu-format-progress-dialog.c
@@ -149,7 +149,6 @@ gdu_format_progress_dialog_constructed (GObject *object)
         gchar *s;
 
 
-        gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
         gtk_dialog_add_button (GTK_DIALOG (dialog),
                                GTK_STOCK_CANCEL,
                                GTK_RESPONSE_CANCEL);
diff --git a/src/gdu-gtk/gdu-add-component-linux-md-dialog.c b/src/gdu-gtk/gdu-add-component-linux-md-dialog.c
index 18dfbe0..8194d13 100644
--- a/src/gdu-gtk/gdu-add-component-linux-md-dialog.c
+++ b/src/gdu-gtk/gdu-add-component-linux-md-dialog.c
@@ -199,7 +199,6 @@ gdu_add_component_linux_md_dialog_constructed (GObject *object)
         array_name = gdu_presentable_get_name (gdu_dialog_get_presentable (GDU_DIALOG (dialog)));
         array_name_vpd = gdu_presentable_get_vpd_name (gdu_dialog_get_presentable (GDU_DIALOG (dialog)));
 
-        gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
         gtk_container_set_border_width (GTK_CONTAINER (dialog), 12);
 
         gtk_dialog_add_button (GTK_DIALOG (dialog),
diff --git a/src/gdu-gtk/gdu-add-pv-linux-lvm2-dialog.c b/src/gdu-gtk/gdu-add-pv-linux-lvm2-dialog.c
index 16450b4..bbf15c6 100644
--- a/src/gdu-gtk/gdu-add-pv-linux-lvm2-dialog.c
+++ b/src/gdu-gtk/gdu-add-pv-linux-lvm2-dialog.c
@@ -219,7 +219,6 @@ gdu_add_pv_linux_lvm2_dialog_constructed (GObject *object)
         vg_name = gdu_presentable_get_name (gdu_dialog_get_presentable (GDU_DIALOG (dialog)));
         vg_name_vpd = gdu_presentable_get_vpd_name (gdu_dialog_get_presentable (GDU_DIALOG (dialog)));
 
-        gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
         gtk_container_set_border_width (GTK_CONTAINER (dialog), 12);
 
         gtk_dialog_add_button (GTK_DIALOG (dialog),
diff --git a/src/gdu-gtk/gdu-ata-smart-dialog.c b/src/gdu-gtk/gdu-ata-smart-dialog.c
index 3b2b81e..a5e59f2 100644
--- a/src/gdu-gtk/gdu-ata-smart-dialog.c
+++ b/src/gdu-gtk/gdu-ata-smart-dialog.c
@@ -1273,8 +1273,6 @@ gdu_ata_smart_dialog_constructed (GObject *object)
         g_free (vpd_name);
         g_free (name);
 
-        gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
-
         content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
 
         align = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
diff --git a/src/gdu-gtk/gdu-confirmation-dialog.c b/src/gdu-gtk/gdu-confirmation-dialog.c
index 35891ca..c81eb33 100644
--- a/src/gdu-gtk/gdu-confirmation-dialog.c
+++ b/src/gdu-gtk/gdu-confirmation-dialog.c
@@ -128,7 +128,6 @@ gdu_confirmation_dialog_constructed (GObject *object)
         vpd_name = NULL;
 
         gtk_window_set_title (GTK_WINDOW (dialog), "");
-        gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
         gtk_container_set_border_width (GTK_CONTAINER (dialog), 12);
 
         gtk_dialog_add_button (GTK_DIALOG (dialog),
diff --git a/src/gdu-gtk/gdu-connect-to-server-dialog.c b/src/gdu-gtk/gdu-connect-to-server-dialog.c
index 9ecf08c..e4c1a83 100644
--- a/src/gdu-gtk/gdu-connect-to-server-dialog.c
+++ b/src/gdu-gtk/gdu-connect-to-server-dialog.c
@@ -208,7 +208,6 @@ gdu_connect_to_server_dialog_constructed (GObject *object)
         gint row;
         gchar *s;
 
-        gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
         gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
 
         gtk_window_set_title (GTK_WINDOW (dialog), _("Connect to Server"));
diff --git a/src/gdu-gtk/gdu-create-linux-md-dialog.c b/src/gdu-gtk/gdu-create-linux-md-dialog.c
index 3ffdefb..a348391 100644
--- a/src/gdu-gtk/gdu-create-linux-md-dialog.c
+++ b/src/gdu-gtk/gdu-create-linux-md-dialog.c
@@ -509,7 +509,6 @@ gdu_create_linux_md_dialog_constructed (GObject *object)
         content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
         action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
 
-        gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
         gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
         gtk_box_set_spacing (GTK_BOX (content_area), 0);
         gtk_container_set_border_width (GTK_CONTAINER (action_area), 5);
diff --git a/src/gdu-gtk/gdu-drive-benchmark-dialog.c b/src/gdu-gtk/gdu-drive-benchmark-dialog.c
index dc080ce..8f66abb 100644
--- a/src/gdu-gtk/gdu-drive-benchmark-dialog.c
+++ b/src/gdu-gtk/gdu-drive-benchmark-dialog.c
@@ -690,8 +690,6 @@ gdu_drive_benchmark_dialog_constructed (GObject *object)
         g_free (vpd_name);
         g_free (name);
 
-        gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
-
         content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
 
         align = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
diff --git a/src/gdu-gtk/gdu-edit-linux-lvm2-dialog.c b/src/gdu-gtk/gdu-edit-linux-lvm2-dialog.c
index 25ebd02..feaeda4 100644
--- a/src/gdu-gtk/gdu-edit-linux-lvm2-dialog.c
+++ b/src/gdu-gtk/gdu-edit-linux-lvm2-dialog.c
@@ -322,7 +322,6 @@ gdu_edit_linux_lvm2_dialog_constructed (GObject *object)
         gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
 
         action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
-        gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
         gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
         gtk_box_set_spacing (GTK_BOX (content_area), 0);
         gtk_container_set_border_width (GTK_CONTAINER (action_area), 5);
diff --git a/src/gdu-gtk/gdu-edit-linux-md-dialog.c b/src/gdu-gtk/gdu-edit-linux-md-dialog.c
index 1c3112a..712f856 100644
--- a/src/gdu-gtk/gdu-edit-linux-md-dialog.c
+++ b/src/gdu-gtk/gdu-edit-linux-md-dialog.c
@@ -360,7 +360,6 @@ gdu_edit_linux_md_dialog_constructed (GObject *object)
         gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
 
         action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
-        gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
         gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
         gtk_box_set_spacing (GTK_BOX (content_area), 0);
         gtk_container_set_border_width (GTK_CONTAINER (action_area), 5);
diff --git a/src/gdu-gtk/gdu-edit-name-dialog.c b/src/gdu-gtk/gdu-edit-name-dialog.c
index b52c2e7..c3c238f 100644
--- a/src/gdu-gtk/gdu-edit-name-dialog.c
+++ b/src/gdu-gtk/gdu-edit-name-dialog.c
@@ -184,7 +184,6 @@ gdu_edit_name_dialog_constructed (GObject *object)
         GtkWidget *table;
         gint row;
 
-        gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
         gtk_container_set_border_width (GTK_CONTAINER (dialog), 12);
 
         gtk_dialog_add_button (GTK_DIALOG (dialog),
diff --git a/src/gdu-gtk/gdu-edit-partition-dialog.c b/src/gdu-gtk/gdu-edit-partition-dialog.c
index ed32ea3..e12356a 100644
--- a/src/gdu-gtk/gdu-edit-partition-dialog.c
+++ b/src/gdu-gtk/gdu-edit-partition-dialog.c
@@ -262,7 +262,6 @@ gdu_edit_partition_dialog_constructed (GObject *object)
         GduPresentable *drive;
         GduDevice *drive_device;
 
-        gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
         gtk_container_set_border_width (GTK_CONTAINER (dialog), 12);
 
         gtk_dialog_add_button (GTK_DIALOG (dialog),
diff --git a/src/gdu-gtk/gdu-error-dialog.c b/src/gdu-gtk/gdu-error-dialog.c
index ce59b5a..08c5cb0 100644
--- a/src/gdu-gtk/gdu-error-dialog.c
+++ b/src/gdu-gtk/gdu-error-dialog.c
@@ -162,7 +162,6 @@ gdu_error_dialog_constructed (GObject *object)
 
         gtk_window_set_title (GTK_WINDOW (dialog), "");
         gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
-        gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
         gtk_container_set_border_width (GTK_CONTAINER (dialog), 12);
 
         button = gtk_dialog_add_button (GTK_DIALOG (dialog),
diff --git a/src/gdu-gtk/gdu-format-dialog.c b/src/gdu-gtk/gdu-format-dialog.c
index f1351ac..a718f82 100644
--- a/src/gdu-gtk/gdu-format-dialog.c
+++ b/src/gdu-gtk/gdu-format-dialog.c
@@ -490,7 +490,6 @@ gdu_format_dialog_constructed (GObject *object)
         content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
         action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
 
-        gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
         gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
         gtk_box_set_spacing (GTK_BOX (content_area), 0);
         gtk_container_set_border_width (GTK_CONTAINER (action_area), 5);
diff --git a/src/gdu-gtk/gdu-partition-dialog.c b/src/gdu-gtk/gdu-partition-dialog.c
index 10a47a6..f36404a 100644
--- a/src/gdu-gtk/gdu-partition-dialog.c
+++ b/src/gdu-gtk/gdu-partition-dialog.c
@@ -199,7 +199,6 @@ gdu_partition_dialog_constructed (GObject *object)
         content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
         action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
 
-        gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
         gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
         gtk_box_set_spacing (GTK_BOX (content_area), 0);
         gtk_container_set_border_width (GTK_CONTAINER (action_area), 5);
diff --git a/src/gdu-gtk/gdu-volume-grid.c b/src/gdu-gtk/gdu-volume-grid.c
index c21415e..6044fa9 100644
--- a/src/gdu-gtk/gdu-volume-grid.c
+++ b/src/gdu-gtk/gdu-volume-grid.c
@@ -268,7 +268,7 @@ is_ctrl_pressed (void)
         ret = FALSE;
 
         gdk_error_trap_push ();
-        status = XkbGetState (GDK_DISPLAY (), XkbUseCoreKbd, &state);
+        status = XkbGetState (gdk_display_get_default (), XkbUseCoreKbd, &state);
         gdk_error_trap_pop ();
 
         if (status == Success) {
diff --git a/src/notification/gdu-slow-unmount-dialog.c b/src/notification/gdu-slow-unmount-dialog.c
index 80aeebd..e5f9e7d 100644
--- a/src/notification/gdu-slow-unmount-dialog.c
+++ b/src/notification/gdu-slow-unmount-dialog.c
@@ -210,8 +210,6 @@ gdu_slow_unmount_dialog_constructed (GObject *object)
         gchar *s;
 
 
-        gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
-
         gtk_window_set_title (GTK_WINDOW (dialog), dialog->priv->device_name);
         pixbuf = gdu_util_get_pixbuf_for_presentable (dialog->priv->presentable, GTK_ICON_SIZE_MENU);
         gtk_window_set_icon (GTK_WINDOW (dialog), pixbuf);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]