summaryrefslogtreecommitdiffstats
path: root/gtk/src/callbacks.c
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2009-05-02 23:58:23 +0000
committerjstebbins <[email protected]>2009-05-02 23:58:23 +0000
commit5ba946fe336baba0d53ae1ca61691d43982761c6 (patch)
tree55fb15037284f5e7536d3cfc3bdb28288b5f42a2 /gtk/src/callbacks.c
parent1b8d2b8a650247865ffd461ece479f8b404f1bee (diff)
LinGui:
poll for dvd volume labels after the ui is fully displayed truncate leading and trailing spaces in volume labels sanitize volume label after making a copy instead of stepping on dvdreads private copy. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2370 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk/src/callbacks.c')
-rw-r--r--gtk/src/callbacks.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
index 00229f132..541d8863f 100644
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -291,9 +291,10 @@ on_quit1_activate(GtkMenuItem *quit, signal_user_data_t *ud)
}
gboolean
-uppers_and_unders(const gchar *str)
+uppers_and_unders(gchar *str)
{
if (str == NULL) return FALSE;
+ str = g_strchomp(g_strchug(str));
while (*str)
{
if (*str == ' ')
@@ -709,7 +710,7 @@ source_dialog_extra_widgets(
gtk_combo_box_append_text (combo, "Not Selected");
while (link != NULL)
{
- gchar *name = get_dvd_volume_name(link->data);
+ gchar *name = get_dvd_device_name(link->data);
gtk_combo_box_append_text(combo, name);
g_free(name);
g_object_unref(link->data);
@@ -2775,7 +2776,7 @@ hbfd_feature_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
gtk_action_set_visible(action, hbfd);
}
-void
+gboolean
ghb_file_menu_add_dvd(signal_user_data_t *ud)
{
GList *link, *drives;
@@ -2833,6 +2834,7 @@ ghb_file_menu_add_dvd(signal_user_data_t *ud)
}
g_list_free(drives);
}
+ return FALSE;
}
gboolean ghb_is_cd(GDrive *gd);