[gnome-disk-utility] Fix warning in "Restore Disk Image" dialog
- From: David Zeuthen <davidz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-disk-utility] Fix warning in "Restore Disk Image" dialog
- Date: Sun, 26 Jan 2014 18:05:51 +0000 (UTC)
commit 6527a2c6e92341dbbe0c79714c532524762b12e6
Author: David Zeuthen <zeuthen gmail com>
Date: Sun Jan 26 10:05:42 2014 -0800
Fix warning in "Restore Disk Image" dialog
Signed-off-by: David Zeuthen <zeuthen gmail com>
src/disks/gdurestorediskimagedialog.c | 8 ++++++--
src/disks/ui/restore-disk-image-dialog.ui | 8 +++++---
2 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/src/disks/gdurestorediskimagedialog.c b/src/disks/gdurestorediskimagedialog.c
index 7ddf2f7..273c0f3 100644
--- a/src/disks/gdurestorediskimagedialog.c
+++ b/src/disks/gdurestorediskimagedialog.c
@@ -1129,8 +1129,12 @@ gdu_restore_disk_image_dialog_show (GduWindow *window,
gtk_window_set_transient_for (GTK_WINDOW (data->dialog), GTK_WINDOW (window));
gtk_window_present (GTK_WINDOW (data->dialog));
- gtk_widget_realize (data->selectable_destination_combobox);
- gtk_widget_grab_focus (data->selectable_destination_combobox);
+ /* The Destination combo-box is only shown if @object is NULL. */
+ if (object == NULL)
+ {
+ gtk_widget_realize (data->selectable_destination_combobox);
+ gtk_widget_grab_focus (data->selectable_destination_combobox);
+ }
}
/* ---------------------------------------------------------------------------------------------------- */
diff --git a/src/disks/ui/restore-disk-image-dialog.ui b/src/disks/ui/restore-disk-image-dialog.ui
index 8657f93..b8267c5 100644
--- a/src/disks/ui/restore-disk-image-dialog.ui
+++ b/src/disks/ui/restore-disk-image-dialog.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="restore-disk-image-dialog">
<property name="width_request">500</property>
<property name="can_focus">False</property>
@@ -58,7 +59,6 @@
<object class="GtkFileChooserButton" id="selectable-image-fcbutton">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
<property name="local_only">False</property>
<property name="title" translatable="yes">Select Disk Image to restore</property>
</object>
@@ -107,7 +107,9 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Destination</property>
+ <property name="label" translatable="yes">_Destination</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">selectable-destination-combobox</property>
<style>
<class name="dim-label"/>
</style>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]