projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Whitespace changes only
[pspp]
/
src
/
ui
/
gui
/
text-data-import-dialog.c
diff --git
a/src/ui/gui/text-data-import-dialog.c
b/src/ui/gui/text-data-import-dialog.c
index 76c95c41781270bd23ca80e279224af17e4a2d73..34127492fa9393ec03a7a157342cd07d71360fd1 100644
(file)
--- a/
src/ui/gui/text-data-import-dialog.c
+++ b/
src/ui/gui/text-data-import-dialog.c
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation
+ Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013
, 2014
Free Software Foundation
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-122,7
+122,7
@@
text_data_import_assistant (PsppireDataWindow *dw)
case GTK_RESPONSE_APPLY:
{
gchar *fn = g_path_get_basename (ia->file.file_name);
case GTK_RESPONSE_APPLY:
{
gchar *fn = g_path_get_basename (ia->file.file_name);
- open_data_window (PSPPIRE_WINDOW (dw), fn, generate_syntax (ia));
+ open_data_window (PSPPIRE_WINDOW (dw), fn,
NULL,
generate_syntax (ia));
g_free (fn);
}
break;
g_free (fn);
}
break;
@@
-138,10
+138,6
@@
text_data_import_assistant (PsppireDataWindow *dw)
destroy_formats_page (ia);
destroy_separators_page (ia);
}
destroy_formats_page (ia);
destroy_separators_page (ia);
}
-
- destroy_assistant (ia);
- destroy_file (ia);
- free (ia);
}
/* Emits PSPP syntax to S that applies the dictionary attributes
}
/* Emits PSPP syntax to S that applies the dictionary attributes
@@
-575,8
+571,8
@@
get_string_width (PsppSheetView *treeview, GtkCellRenderer *renderer,
{
gint width;
g_object_set (G_OBJECT (renderer), "text", string, (void *) NULL);
{
gint width;
g_object_set (G_OBJECT (renderer), "text", string, (void *) NULL);
- gtk_cell_renderer_get_
size
(renderer, GTK_WIDGET (treeview),
-
NULL, NULL, NULL, &width, NULL
);
+ gtk_cell_renderer_get_
preferred_width
(renderer, GTK_WIDGET (treeview),
+
NULL, &width
);
return width;
}
return width;
}
@@
-659,7
+655,7
@@
push_watch_cursor (struct import_assistant *ia)
GdkDisplay *display = gtk_widget_get_display (widget);
GdkCursor *cursor = gdk_cursor_new_for_display (display, GDK_WATCH);
gdk_window_set_cursor (gtk_widget_get_window (widget), cursor);
GdkDisplay *display = gtk_widget_get_display (widget);
GdkCursor *cursor = gdk_cursor_new_for_display (display, GDK_WATCH);
gdk_window_set_cursor (gtk_widget_get_window (widget), cursor);
- g
dk_cursor
_unref (cursor);
+ g
_object
_unref (cursor);
gdk_display_flush (display);
}
}
gdk_display_flush (display);
}
}