diff options
| -rw-r--r-- | drivemount/drive-button.c | 28 | ||||
| -rw-r--r-- | drivemount/drive-list.c | 2 |
2 files changed, 16 insertions, 14 deletions
diff --git a/drivemount/drive-button.c b/drivemount/drive-button.c index b4fc6dc3..2c93ce75 100644 --- a/drivemount/drive-button.c +++ b/drivemount/drive-button.c @@ -890,22 +890,24 @@ drive_button_ensure_popup (DriveButton *self) mounted = FALSE; if (self->volume) { - GMount *mount = NULL; + GMount *mount = NULL; - display_name = g_volume_get_name (self->volume); - ejectable = g_volume_can_eject (self->volume); + display_name = g_volume_get_name (self->volume); + ejectable = g_volume_can_eject (self->volume); - mount = g_volume_get_mount (self->volume); - if (mount) { - mounted = TRUE; - g_object_unref (mount); - } + mount = g_volume_get_mount (self->volume); + if (mount) { + mounted = TRUE; + g_object_unref (mount); + } } else { - if (!G_IS_MOUNT(self->volume)) - return; - display_name = g_mount_get_name (self->mount); - ejectable = g_mount_can_eject (self->mount); - mounted = TRUE; + if (!G_IS_MOUNT(self->volume)) + return; + else { + display_name = g_mount_get_name (self->mount); + ejectable = g_mount_can_eject (self->mount); + mounted = TRUE; + } } self->popup_menu = gtk_menu_new (); diff --git a/drivemount/drive-list.c b/drivemount/drive-list.c index 5dfbd5e1..7ebb6240 100644 --- a/drivemount/drive-list.c +++ b/drivemount/drive-list.c @@ -240,7 +240,7 @@ relayout_buttons (gpointer data) { DriveList *self = DRIVE_LIST (data); GList *sorted_buttons = NULL, *tmp; - int i; + int i = 0; self->layout_tag = 0; |