summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2014-05-16 09:52:04 +0000
committerjstebbins <[email protected]>2014-05-16 09:52:04 +0000
commit921c659de321eedb3784105652bccce511867e1a (patch)
tree4b2b3de54e74259ab492f39febc562bfb135ceaf
parent4274a3ea62219e35eeafc525bbb84e25bfb63615 (diff)
LinGui: fix some glib warning messages in log
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6196 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--gtk/src/main.c6
-rw-r--r--gtk/src/makedeps.py1
-rw-r--r--gtk/src/x264handler.c1
3 files changed, 3 insertions, 5 deletions
diff --git a/gtk/src/main.c b/gtk/src/main.c
index e7eaf8f6a..de9218e60 100644
--- a/gtk/src/main.c
+++ b/gtk/src/main.c
@@ -977,6 +977,9 @@ main(int argc, char *argv[])
ghb_init_audio_defaults_ui(ud);
ghb_init_subtitle_defaults_ui(ud);
+ // Parsing x264 options "" initializes x264 widgets to proper defaults
+ ghb_x264_init(ud);
+
// Load prefs before presets. Some preset defaults may depend
// on preference settings.
// First load default values
@@ -1012,9 +1015,6 @@ main(int argc, char *argv[])
ghb_dvd_set_current(source, ud);
g_free(source);
- // Parsing x264 options "" initializes x264 widgets to proper defaults
- ghb_x264_init(ud);
-
// Populate the presets tree view
ghb_presets_list_init(ud, NULL, 0);
// Get the first preset name
diff --git a/gtk/src/makedeps.py b/gtk/src/makedeps.py
index 248b1864f..53ef63e89 100644
--- a/gtk/src/makedeps.py
+++ b/gtk/src/makedeps.py
@@ -12,7 +12,6 @@ dep_map = (
DepEntry("title", "preview_frame", "none", True, False),
DepEntry("title", "picture_summary", "none", True, False),
DepEntry("title", "picture_summary2", "none", True, False),
- DepEntry("title", "chapters_label", "none", True, False),
DepEntry("title", "chapters_tab", "none", True, False),
DepEntry("title", "start_point", "none", True, False),
DepEntry("title", "end_point", "none", True, False),
diff --git a/gtk/src/x264handler.c b/gtk/src/x264handler.c
index 2db791173..d631aa633 100644
--- a/gtk/src/x264handler.c
+++ b/gtk/src/x264handler.c
@@ -1264,5 +1264,4 @@ void
ghb_x264_init(signal_user_data_t *ud)
{
ud->x264_priv = ghb_settings_new();
- ghb_x264_parse_options(ud, "");
}