Commit f5778882 authored by Andreas Rönnquist's avatar Andreas Rönnquist

New upstream version 1.09

parent 8d68d7f6
......@@ -87,7 +87,7 @@ gboolean load_graphics(GtkWidget *widget, GError **err)
}
GdkDisplay *default_display = NULL;
GdkDisplay *default_display;
default_display = gdk_display_get_default();
......
......@@ -418,7 +418,6 @@ void refresh_folder_cb()
// First, store all GtkTreePath in a linked list
if (gtk_tree_model_iter_children(tree_model, &child, &iter)) {
int co = 0;
GtkTreePath *tree_path;
GtkTreeIter *temp_iter = &child;
......@@ -433,7 +432,6 @@ void refresh_folder_cb()
list_of_items=g_list_append(list_of_items, row_reference);
gtk_tree_path_free(tree_path);
co++;
} while(gtk_tree_model_iter_next(tree_model, temp_iter));
......
......@@ -278,7 +278,7 @@ gboolean init_prefs(gchar *target_directory, GError **err)
// Check if it is an old-style config, or a new LUA one
if (check_for_old_style_config(config_string)) {
gchar **savedlist = NULL;
gchar **savedlist;
debug_printf("Old style config\n");
// split out the lines, and add each to the list of strings
......
......@@ -56,7 +56,7 @@ void my_set_align(GtkWidget *widget)
void group_properties_gui(GtkTreeModel *tree_model, GtkTreeIter *iter)
{
GError *err = NULL;
GtkWidget *dialog = NULL;
GtkWidget *dialog;
gchar *nodename = NULL;
GtkWidget *table;
......@@ -156,7 +156,7 @@ void file_properties_gui(GtkTreeModel *model, GtkTreeIter *iter)
GtkWidget *label1, *label2, *label3;
GtkWidget *path, *filename, *filesize_label;
GtkWidget *container_vbox = NULL;
GtkWidget *dialog = NULL;
GtkWidget *dialog;
gchar *filePath = NULL;
int nodeType = -1;
......
......@@ -102,8 +102,6 @@ GList *get_list_of_selected_items_string_list(GtkTreeView *treeview)
GtkTreeIter iter;
int count = 0;
while (row_list) {
GtkTreePath *path = (GtkTreePath *)row_list->data;
......@@ -116,9 +114,6 @@ GList *get_list_of_selected_items_string_list(GtkTreeView *treeview)
gtk_tree_model_get(model, &iter, COLUMN_FILEPATH, &path, -1);
string_list = g_list_prepend(string_list, path);
count++;
}
row_list = row_list -> prev;
......@@ -193,14 +188,12 @@ void remove_selected_items ( GtkTreeView *treeview )
{
GError *error = NULL;
GtkTreeIter iter;
GtkTreeModel *model=gtk_tree_view_get_model(treeview);
GtkTreeModel *model = gtk_tree_view_get_model(treeview);
GList *list = get_list_of_selected_items_rows(treeview); // gtk_tree_selection_get_selected_rows( selection, &model );
int nRemoved = 0;
// Begin at the end and go to the start
list=g_list_last(list);
list = g_list_last(list);
while(list) {
GString *fixed_path = g_string_new("");
g_string_printf(fixed_path, "%s", gtk_tree_path_to_string((GtkTreePath*)list->data)/*ipath*/);
......@@ -212,7 +205,6 @@ void remove_selected_items ( GtkTreeView *treeview )
if ( gtk_tree_model_get_iter ( model, &iter, path) ) { // get iter from specified path
remove_tree_node(&iter, &error);
nRemoved++;
}
else { // invalid path
g_error(_("Error!!!\n"));
......@@ -222,7 +214,7 @@ void remove_selected_items ( GtkTreeView *treeview )
else {
g_error(_("Error!!!\n"));
}
list=list->prev;
list = list->prev;
}
g_list_foreach (list, (GFunc)gtk_tree_path_free, NULL);
......@@ -250,7 +242,7 @@ GtkWidget *do_question_dialog(const gchar *buffer)
*/
gboolean really_do_delete_question(const gchar *format, ...)
{
GtkWidget *dialog = NULL;
GtkWidget *dialog;
gint dialog_response;
char buffer[256];
gboolean result;
......
......@@ -351,7 +351,7 @@ gboolean add_tree_file(GtkTreeIter *currentIter,
++fileExt;
}
if (fileExt == NULL || strlen(fileExt) <= 0) {
if (fileExt == NULL || strlen(fileExt) == 0) {
fileExt = (gchar*)fileName;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment