summaryrefslogtreecommitdiff
path: root/logview/logview-app.c
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2012-11-15 12:40:21 -0800
committerStefano Karapetsas <[email protected]>2012-11-15 12:40:21 -0800
commit0402d2a3d30ec2175eb3ea4cd2a801bf589d3388 (patch)
treec185cf295dfd1d80ffd4792088e179d001ae39a2 /logview/logview-app.c
parent381d345351f1d3a0fb34bb125f1411af61ce67ad (diff)
parent1aa6079a48aacd1b495f6944848e3d432a4b115d (diff)
downloadmate-utils-0402d2a3d30ec2175eb3ea4cd2a801bf589d3388.tar.bz2
mate-utils-0402d2a3d30ec2175eb3ea4cd2a801bf589d3388.tar.xz
Merge pull request #7 from bhull2010/master
Port logview to Gsettings
Diffstat (limited to 'logview/logview-app.c')
-rw-r--r--logview/logview-app.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/logview/logview-app.c b/logview/logview-app.c
index a13f29d4..b45f4ac5 100644
--- a/logview/logview-app.c
+++ b/logview/logview-app.c
@@ -338,23 +338,22 @@ logview_app_initialize (LogviewApp *app, char **log_files)
if (log_files == NULL) {
char *active_log;
- GSList *logs;
+ gchar **logs;
active_log = logview_prefs_get_active_logfile (priv->prefs);
logs = logview_prefs_get_stored_logfiles (priv->prefs);
- if (!logs) {
+ if (!logs || !logs[0]) {
logview_app_first_time_initialize (app);
} else {
- logview_manager_add_logs_from_name_list (priv->manager,
- logs, active_log);
+ logview_manager_add_logs_from_names (priv->manager,
+ logs, active_log);
g_free (active_log);
- g_slist_foreach (logs, (GFunc) g_free, NULL);
- g_slist_free (logs);
+ g_strfreev (logs);
}
} else {
- logview_manager_add_logs_from_names (priv->manager, log_files);
+ logview_manager_add_logs_from_names (priv->manager, log_files, NULL);
}
gtk_widget_show (GTK_WIDGET (priv->window));