diff options
author | Agney Lopes Roth Ferraz <agney@debian.org> | 2009-09-24 15:13:54 -0300 |
---|---|---|
committer | Simon Quigley <tsimonq2@ubuntu.com> | 2017-06-19 14:38:49 -0500 |
commit | 0bd39c5982a7776caae412f93f9dd2abf0b3eaea (patch) | |
tree | 0fdf3718ea01d3aa834e850c983c65edce14a583 /shell.c | |
parent | 1b6665085f47e0a86e4bebd5e313a2ab63600eb4 (diff) | |
parent | 7c47b5b9584f5011aeba18d7e1b26b3d3124825f (diff) |
Import Debian changes 0.5.1-1
hardinfo (0.5.1-1) unstable; urgency=low
* New upstream version. (Closes: #530290, #517591)
Diffstat (limited to 'shell.c')
-rw-r--r-- | shell.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -846,7 +846,7 @@ group_handle_special(GKeyFile * key_file, ShellModuleEntry * entry, } else if (g_str_equal(key, "ShowColumnHeaders")) { headers_visible = g_key_file_get_boolean(key_file, group, key, NULL); } else if (g_str_has_prefix(key, "ColumnTitle")) { - GtkTreeViewColumn *column; + GtkTreeViewColumn *column = NULL; gchar *value, *title = strchr(key, '$') + 1; value = g_key_file_get_value(key_file, group, key, NULL); @@ -863,8 +863,10 @@ group_handle_special(GKeyFile * key_file, ShellModuleEntry * entry, column = shell->info->col_progress; } - gtk_tree_view_column_set_title(column, value); - gtk_tree_view_column_set_visible(column, TRUE); + if (column) { + gtk_tree_view_column_set_title(column, value); + gtk_tree_view_column_set_visible(column, TRUE); + } g_free(value); } else if (g_str_equal(key, "OrderType")) { @@ -1253,7 +1255,6 @@ static void module_selected(gpointer data) ShellModuleEntry *entry; static ShellModuleEntry *current = NULL; static gboolean updating = FALSE; - /* Gets the currently selected item on the left-side TreeView; if there is no selection, silently return */ |