summaryrefslogtreecommitdiffstats
path: root/gtk
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2009-07-31 20:59:45 +0000
committerjstebbins <[email protected]>2009-07-31 20:59:45 +0000
commitc0642a767ce8fab4e4f4aaba19d72eee2220daf5 (patch)
tree164b8764ac9e122f803afedaf36299d156fda412 /gtk
parent9226415e4bc37ff9b26c8e183e7c4835a2003eac (diff)
LinGui: fix a problem with running mingw cross compiled ghb under wine
wine's implementation of GetVolumeInformation requires a '\' after drive letters. if not, it returns junk. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2741 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk')
-rw-r--r--gtk/src/callbacks.c4
-rw-r--r--gtk/src/ghb.ui4
2 files changed, 4 insertions, 4 deletions
diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
index f25e6e563..ab7cb31d8 100644
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -393,7 +393,7 @@ get_direct_dvd_volume_name(const gchar *drive)
gchar *result = NULL;
gchar vname[51], fsname[51];
- if (GetVolumeInformation(drive, vname, 50, NULL, NULL, NULL, fsname, 51))
+ if (GetVolumeInformation(drive, vname, 50, NULL, NULL, NULL, fsname, 50))
{
result = g_strdup_printf("%s", vname);
}
@@ -656,7 +656,6 @@ update_source_label(signal_user_data_t *ud, const gchar *source, gboolean update
g_debug("update_source_label()");
len = strlen(filename);
- if (filename[len-1] == G_DIR_SEPARATOR) filename[len-1] = 0;
if (g_file_test(filename, G_FILE_TEST_IS_DIR))
{
// Skip dos drive letters
@@ -671,6 +670,7 @@ update_source_label(signal_user_data_t *ud, const gchar *source, gboolean update
}
else
{
+ if (filename[len-1] == G_DIR_SEPARATOR) filename[len-1] = 0;
if (start != NULL)
start++;
else
diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui
index e7eed9cfd..608743f4a 100644
--- a/gtk/src/ghb.ui
+++ b/gtk/src/ghb.ui
@@ -3443,7 +3443,7 @@ no-dct-decimate=0:cabac=1</property>
</packing>
</child>
<child>
- <object class="GtkAlignment" id="alignment66">
+ <object class="GtkAlignment" id="alignment71">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="left_padding">12</property>
@@ -4016,7 +4016,7 @@ no-dct-decimate=0:cabac=1</property>
</packing>
</child>
<child>
- <object class="GtkAlignment" id="alignment61">
+ <object class="GtkAlignment" id="alignment70">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="yscale">0</property>