Commit b1a9bd0c authored by Paolo Bacchilega's avatar Paolo Bacchilega Committed by Paolo Bacchilega

Fixes bug #171618: header cleanup. Patch by Kristof Vansant.

2005-04-15  Paolo Bacchilega  <paobac@cvs.gnome.org>

	* src/window.c:
	* src/ui.h:
	* src/preferences.c:
	* src/main.c:
	* src/gconf-utils.c:
	* src/fr-command-zip.c:
	* src/fr-command-tar.c:
	* src/fr-command-rpm.c:
	* src/fr-command-iso.c:
	* src/fr-command-7z.c:
	* src/fr-archive.c:
	* src/file-utils.c:
	* src/file-data.c:
	* src/dlg-prop.c:
	* src/dlg-password.c:
	* src/dlg-open-with.c:
	* src/dlg-extract.c:
	* src/dlg-delete.c:
	* src/dlg-add-folder.c:
	* src/dlg-batch-add.c:
	* src/dlg-add-files.c:
	* src/actions.c:

	Fixes bug #171618: header cleanup.  Patch by Kristof Vansant.

2005-04-06  Alan Horkan <horkana@tcd.ie>

        * src/ui.h: Be nice to translators, allow stock labels
        (and keybindings where appropriate) to show through.
        Should make translation work a little less painful.

2005-04-15  Paolo Bacchilega  <paobac@cvs.gnome.org>

	* src/dlg-add-files.c (GLADE_FILE):
	* src/dlg-add-folder.c (GLADE_FILE, save_options_cb): restore
	the selected folder.

	* src/dlg-prop.c (PROP_GLADE_FILE):
	* src/dlg-password.c (PROP_GLADE_FILE):
	* src/dlg-open-with.c (GLADE_FILE):
	* src/dlg-delete.c (EXTRACT_GLADE_FILE):
	* src/dlg-batch-add.c (GLADE_FILE):

	rename file_roller.glade to file-roller.glade

	* configure.in: set version to 2.11.0
parent fb4fdd43
2005-04-15 Paolo Bacchilega <paobac@cvs.gnome.org>
* src/window.c:
* src/ui.h:
* src/preferences.c:
* src/main.c:
* src/gconf-utils.c:
* src/fr-command-zip.c:
* src/fr-command-tar.c:
* src/fr-command-rpm.c:
* src/fr-command-iso.c:
* src/fr-command-7z.c:
* src/fr-archive.c:
* src/file-utils.c:
* src/file-data.c:
* src/dlg-prop.c:
* src/dlg-password.c:
* src/dlg-open-with.c:
* src/dlg-extract.c:
* src/dlg-delete.c:
* src/dlg-add-folder.c:
* src/dlg-batch-add.c:
* src/dlg-add-files.c:
* src/actions.c:
Fixes bug #171618: header cleanup. Patch by Kristof Vansant.
2005-04-06 Alan Horkan <horkana@tcd.ie>
* src/ui.h: Be nice to translators, allow stock labels
(and keybindings where appropriate) to show through.
Should make translation work a little less painful.
2005-04-15 Paolo Bacchilega <paobac@cvs.gnome.org>
* src/dlg-add-files.c (GLADE_FILE):
* src/dlg-add-folder.c (GLADE_FILE, save_options_cb): restore
the selected folder.
* src/dlg-prop.c (PROP_GLADE_FILE):
* src/dlg-password.c (PROP_GLADE_FILE):
* src/dlg-open-with.c (GLADE_FILE):
* src/dlg-delete.c (EXTRACT_GLADE_FILE):
* src/dlg-batch-add.c (GLADE_FILE):
rename file_roller.glade to file-roller.glade
* configure.in: set version to 2.11.0
2005-04-11 Paolo Bacchilega <paobac@cvs.gnome.org>
* src/fr-command-rar.c (fr_command_rar_new): && instead of ||
......
## Process this file with automake to produce Makefile.in.
SUBDIRS = \
data \
src \
help \
component \
nautilus \
po
desktopdir = $(datadir)/applications
desktop_in_files=file-roller.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
icondir = $(datadir)/pixmaps
icon_DATA = file-roller.png
applicationsdir = $(datadir)/application-registry
applications_DATA = file-roller.applications
mimedir = $(datadir)/mime-info
mime_DATA = file-roller.mime file-roller.keys
distcleancheck_listfiles = find . -type f -print | grep -v 'omf\.out'
distuninstallcheck_listfiles = find . -type f -print | grep -v '^\./var/scrollkeeper' | grep -v 'omf' | grep -v 'figures'
......@@ -38,16 +24,10 @@ EXTRA_DIST = \
intltool-update.in \
intltool-extract.in \
omf.make \
xmldocs.make \
$(desktop_in_files) \
$(desktop_DATA) \
$(applications_DATA) \
$(mime_DATA) \
$(icon_DATA)
xmldocs.make
DISTCLEANFILES = \
po/.intltool-merge-cache \
$(desktop_DATA) \
intltool-extract \
intltool-merge \
intltool-update
......@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.52)
AC_INIT(file-roller, 2.10.2)
AC_INIT(file-roller, 2.11.0)
AC_CONFIG_SRCDIR(src/main.c)
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
AM_CONFIG_HEADER(config.h)
......@@ -111,6 +111,8 @@ dnl ******************************
AC_OUTPUT([
Makefile
file-roller.spec
data/Makefile
data/glade/Makefile
src/Makefile
src/icons/Makefile
src/recent-files/Makefile
......
Makefile
Makefile.in
file-roller.desktop
SUBDIRS = glade
desktopdir = $(datadir)/applications
desktop_in_files=file-roller.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
applicationsdir = $(datadir)/application-registry
applications_DATA = file-roller.applications
icondir = $(datadir)/pixmaps
icon_DATA = file-roller.png
schemadir = @GCONF_SCHEMA_FILE_DIR@
schema_DATA = file-roller.schemas
if SCHEMAS_INSTALL
install-data-local:
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
endif
mimedir = $(datadir)/mime-info
mime_DATA = file-roller.mime file-roller.keys
EXTRA_DIST = \
$(applications_DATA) \
$(desktop_in_files) \
$(desktop_DATA) \
$(mime_DATA) \
$(icon_DATA) \
$(schema_DATA)
DISTCLEANFILES = \
$(desktop_DATA)
Makefile
Makefile.in
*.bak
*.gladep
glade_DATA = file-roller.glade file-roller-extract.glade
gladedir = $(datadir)/file-roller/glade
EXTRA_DIST = $(glade_DATA)
<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
<glade-interface>
<widget class="GtkDialog" id="extract_dialog">
<property name="title" translatable="yes">Extract</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
<property name="decorated">True</property>
<property name="skip_taskbar_hint">False</property>
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="focus_on_map">True</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox1">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">6</property>
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
<widget class="GtkButton" id="e_helpbutton">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
<property name="label">gtk-help</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">-11</property>
</widget>
</child>
<child>
<widget class="GtkButton" id="e_cancelbutton">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
<property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">-6</property>
</widget>
</child>
<child>
<widget class="GtkButton" id="e_okbutton">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">e_okbutton</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">-5</property>
</widget>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">GTK_PACK_END</property>
</packing>
</child>
<child>
<widget class="GtkVBox" id="e_main_vbox">
<property name="border_width">6</property>
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">12</property>
<child>
<widget class="GtkHBox" id="hbox1">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">6</property>
<child>
<widget class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="label" translatable="yes">Extract in _folder:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkFileChooserButton" id="e_destination_filechooserbutton">
<property name="visible">True</property>
<property name="title" translatable="yes">Seleziona un file</property>
<property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
<property name="local_only">True</property>
<property name="show_hidden">False</property>
<property name="width_chars">-1</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">True</property>
</packing>
</child>
<child>
<placeholder/>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
</widget>
</child>
</widget>
</glade-interface>
# List of source files containing translatable strings.
# Please keep this file sorted alphabetically.
component/File_Roller_Component.server.in.in
data/glade/file-roller.glade
data/glade/file-roller-extract.glade
data/file-roller.desktop.in
nautilus/fileroller-module.c
nautilus/nautilus-fileroller.h
nautilus/nautilus-fileroller.c
file-roller.desktop.in
src/actions.c
src/bookmarks.c
src/bookmarks.h
......@@ -30,7 +32,6 @@ src/file-list.c
src/file-list.h
src/file-utils.c
src/file-utils.h
src/file_roller.glade
src/fr-archive.c
src/fr-archive.h
src/fr-command-ar.c
......
......@@ -9,16 +9,14 @@ else
MKDTEMP_FILES=
endif
glade_DATA = \
file_roller.glade
gladedir = $(datadir)/file-roller/glade
if ENABLE_DEPRECATIONS
DISABLE_DEPRECATED = -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED
else
DISABLE_DEPRECATED =
endif
gladedir = $(datadir)/file-roller/glade
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/src/recent-files \
......@@ -130,17 +128,7 @@ file_roller_LDADD = \
$(top_builddir)/src/recent-files/librecent.a \
$(FR_LIBS)
schemadir = @GCONF_SCHEMA_FILE_DIR@
schema_DATA = file-roller.schemas
if SCHEMAS_INSTALL
install-data-local:
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
endif
EXTRA_DIST = \
$(glade_DATA) \
$(schema_DATA) \
fr-marshal.list
CLEANFILES = $(BUILT_SOURCES)
......@@ -26,7 +26,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <gnome.h>
#include <libgnome/gnome-help.h>
#include <libgnomevfs/gnome-vfs-utils.h>
#include "actions.h"
#include "dlg-add-files.h"
......
......@@ -22,9 +22,9 @@
#include <config.h>
#include <string.h>
#include <unistd.h>
#include <gtk/gtk.h>
#include <gnome.h>
#include <glade/glade.h>
#include <libgnomevfs/gnome-vfs-mime.h>
#include <libgnomevfs/gnome-vfs-mime-handlers.h>
......@@ -36,7 +36,7 @@
#include "gtk-utils.h"
#define GLADE_FILE "file_roller.glade"
#define GLADE_FILE "file-roller.glade"
typedef struct {
......
......@@ -22,9 +22,10 @@
#include <config.h>
#include <string.h>
#include <unistd.h>
#include <gtk/gtk.h>
#include <gnome.h>
#include <libgnome/gnome-config.h>
#include <glade/glade.h>
#include <libgnomevfs/gnome-vfs-mime.h>
#include <libgnomevfs/gnome-vfs-mime-handlers.h>
......@@ -36,7 +37,7 @@
#include "gtk-utils.h"
#define GLADE_FILE "file_roller.glade"
#define GLADE_FILE "file-roller.glade"
typedef struct {
......@@ -547,12 +548,12 @@ aod_apply_cb (GtkWidget *widget,
/* Sync widgets with options. */
if (base_dir != NULL)
if (base_dir != NULL)
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (data->dialog), base_dir);
/* FIXME
if (filename != NULL)
gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (data->dialog), filename);
*/
gtk_file_chooser_select_filename (GTK_FILE_CHOOSER (data->dialog), filename);
if (include_files != NULL)
gtk_entry_set_text (GTK_ENTRY (data->include_files_entry), include_files);
if (exclude_files != NULL)
......
......@@ -23,8 +23,11 @@
#include <config.h>
#include <string.h>
#include <math.h>
#include <unistd.h>
#include <gnome.h>
#include <gtk/gtk.h>
#include <libgnomeui/gnome-icon-theme.h>
#include <libgnomeui/gnome-icon-lookup.h>
#include <glade/glade.h>
#include <libgnomevfs/gnome-vfs-types.h>
#include <libgnomevfs/gnome-vfs-mime.h>
......@@ -39,7 +42,7 @@
#include "preferences.h"
#define GLADE_FILE "file_roller.glade"
#define GLADE_FILE "file-roller.glade"
#define UPDATE_DROPPED_FILES (FALSE)
#define ARCHIVE_ICON_SIZE (48)
#define DEFAULT_EXTENSION ".tar.gz"
......
......@@ -23,12 +23,11 @@
#include <config.h>
#include <gtk/gtk.h>
#include <glade/glade.h>
#include <libgnomeui/gnome-file-entry.h>
#include "window.h"
#include "gtk-utils.h"
#define EXTRACT_GLADE_FILE "file_roller.glade"
#define EXTRACT_GLADE_FILE "file-roller.glade"
typedef struct {
......
......@@ -3,7 +3,7 @@
/*
* File-Roller
*
* Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
* Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
*
* 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
......@@ -22,8 +22,10 @@
#include <config.h>
#include <string.h>
#include <unistd.h>
#include <gnome.h>
#include <libgnome/gnome-help.h>
#include <glade/glade.h>
#include "bookmarks.h"
#include "file-utils.h"
......@@ -35,11 +37,17 @@
#include "gconf-utils.h"
#define GLADE_FILE "file-roller-extract.glade"
typedef struct {
FRWindow *window;
GladeXML *gui;
GtkWidget *dialog;
GtkWidget *e_main_vbox;
GtkWidget *e_destination_filechooserbutton;
GtkWidget *e_all_radiobutton;
GtkWidget *e_selected_radiobutton;
GtkWidget *e_files_radiobutton;
......@@ -63,6 +71,8 @@ static void
destroy_cb (GtkWidget *widget,
DialogData *data)
{
g_object_unref (G_OBJECT (data->gui));
if (! data->extract_clicked) {
window_pop_message (data->window);
window_batch_mode_stop (data->window);
......@@ -107,9 +117,17 @@ show_dialog_help (DialogData *data)
static int
file_sel_response_cb (GtkWidget *w,
int response,
DialogData *data)
help_cb (GtkWidget *w,
DialogData *data)
{
show_dialog_help (data);
return TRUE;
}
static int
extract_cb (GtkWidget *w,
DialogData *data)
{
FRWindow *window = data->window;
gboolean do_not_extract = FALSE;
......@@ -123,25 +141,11 @@ file_sel_response_cb (GtkWidget *w,
char *password;
const char *base_dir = NULL;
if ((response == GTK_RESPONSE_CANCEL)
|| (response == GTK_RESPONSE_DELETE_EVENT)) {
gtk_widget_destroy (data->dialog);
return TRUE;
}
if (response == GTK_RESPONSE_HELP) {
show_dialog_help (data);
return TRUE;
}
if (response != GTK_RESPONSE_OK)
return FALSE;
data->extract_clicked = TRUE;
/* collect extraction options. */
extract_to_dir = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (data->dialog));
extract_to_dir = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (data->e_destination_filechooserbutton));
/* check directory existence. */
......@@ -483,10 +487,16 @@ dlg_extract (GtkWidget *widget,
{
FRWindow *window = callback_data;
DialogData *data;
GtkFileChooser *file_sel;
GtkWidget *e_okbutton, *e_cancelbutton, *e_helpbutton;
data = g_new (DialogData, 1);
data->gui = glade_xml_new (GLADEDIR "/" GLADE_FILE , NULL, NULL);
if (! data->gui) {
g_warning ("Could not find " GLADE_FILE "\n");
return;
}
data->window = window;
data->extract_clicked = FALSE;
......@@ -496,25 +506,23 @@ dlg_extract (GtkWidget *widget,
/* Get the widgets. */
data->dialog = gtk_file_chooser_dialog_new (
_("Extract"),
GTK_WINDOW (data->window->app),
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
GTK_STOCK_HELP, GTK_RESPONSE_HELP,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
FR_STOCK_EXTRACT, GTK_RESPONSE_OK,
NULL);
file_sel = GTK_FILE_CHOOSER (data->dialog);
gtk_file_chooser_set_select_multiple (file_sel, FALSE);
gtk_file_chooser_set_local_only (file_sel, TRUE);
data->dialog = glade_xml_get_widget (data->gui, "extract_dialog");
data->e_main_vbox = glade_xml_get_widget (data->gui, "e_main_vbox");
data->e_destination_filechooserbutton = glade_xml_get_widget (data->gui, "e_destination_filechooserbutton");
e_okbutton = glade_xml_get_widget (data->gui, "e_okbutton");
e_cancelbutton = glade_xml_get_widget (data->gui, "e_cancelbutton");
e_helpbutton = glade_xml_get_widget (data->gui, "e_helpbutton");
gtk_dialog_set_default_response (GTK_DIALOG (data->dialog), GTK_RESPONSE_OK);
gtk_button_set_use_stock (GTK_BUTTON (e_okbutton), TRUE);
gtk_button_set_label (GTK_BUTTON (e_okbutton), FR_STOCK_EXTRACT);
gtk_file_chooser_set_extra_widget (file_sel, create_extra_widget (data));
gtk_box_pack_start (GTK_BOX (data->e_main_vbox), create_extra_widget (data), TRUE, TRUE, 0);
/* Set widgets data. */
if (window->extract_default_dir != NULL)
gtk_file_chooser_set_current_folder (file_sel, window->extract_default_dir);
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (data->e_destination_filechooserbutton), window->extract_default_dir);
if (_gtk_count_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW (window->list_view))) > 0)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->e_selected_radiobutton), TRUE);
......@@ -548,9 +556,17 @@ dlg_extract (GtkWidget *widget,
G_CALLBACK (destroy_cb),
data);
g_signal_connect (G_OBJECT (data->dialog),
"response",
G_CALLBACK (file_sel_response_cb),
g_signal_connect (G_OBJECT (e_okbutton),
"clicked",
G_CALLBACK (extract_cb),
data);
g_signal_connect_swapped (G_OBJECT (e_cancelbutton),
"clicked",
G_CALLBACK (gtk_widget_destroy),
G_OBJECT (data->dialog));
g_signal_connect (G_OBJECT (e_helpbutton),
"clicked",
G_CALLBACK (help_cb),
data);
g_signal_connect (G_OBJECT (data->e_overwrite_checkbutton),
......
......@@ -22,8 +22,8 @@
#include <config.h>
#include <string.h>
#include <gtk/gtk.h>
#include <gnome.h>
#include <glade/glade.h>
#include <libgnomevfs/gnome-vfs-mime.h>
#include <libgnomevfs/gnome-vfs-mime-handlers.h>
......@@ -33,7 +33,7 @@
#include "window.h"
#define GLADE_FILE "file_roller.glade"
#define GLADE_FILE "file-roller.glade"
#define TEMP_DOCS "temp_docs"
......
......@@ -25,14 +25,13 @@
#include <gtk/gtk.h>
#include <glade/glade.h>
#include <libgnomeui/gnome-file-entry.h>
#include <libgnomevfs/gnome-vfs-types.h>
#include <libgnomevfs/gnome-vfs-utils.h>
#include "gtk-utils.h"
#include "window.h"
#define PROP_GLADE_FILE "file_roller.glade"
#define PROP_GLADE_FILE "file-roller.glade"
typedef struct {
......
......@@ -24,15 +24,13 @@
#include <string.h>
#include <gtk/gtk.h>
#include <gnome.h>
#include <glade/glade.h>
#include <libgnomeui/gnome-file-entry.h>
#include <libgnomevfs/gnome-vfs-types.h>
#include <libgnomevfs/gnome-vfs-utils.h>
#include "file-utils.h"
#include "window.h"
#define PROP_GLADE_FILE "file_roller.glade"
#define PROP_GLADE_FILE "file-roller.glade"
typedef struct {
......
......@@ -21,7 +21,7 @@
*/
#include <config.h>
#include <gnome.h>
#include <glib/gi18n.h>
#include <libgnomevfs/gnome-vfs-mime-handlers.h>
#include "file-data.h"
......
......@@ -35,7 +35,6 @@
#include <dirent.h>
#include <glib.h>
#include <libgnome/libgnome.h>
#include <libgnomevfs/gnome-vfs.h>
#include <libgnomevfs/gnome-vfs-mime.h>
#include <gconf/gconf-client.h>
......
......@@ -25,8 +25,9 @@
#include <string.h>
#include <stdio.h>
#include <sys/param.h>
#include <glib.h>
#include <gnome.h>
#include <glib/gi18n.h>
#include <libgnomevfs/gnome-vfs-mime.h>
#include "file-data.h"
#include "file-list.h"
......
......@@ -26,7 +26,6 @@
#include <time.h>
#include <glib.h>
#include <gnome.h>