mirror of
https://gitlab.gnome.org/GNOME/nautilus
synced 2024-09-12 20:41:34 +00:00
Use single GLib/GTK+ includes. Patch by Maxim Ermilov (#560432).
2008-12-06 Cosimo Cecchi <cosimoc@gnome.org> * cut-n-paste-code/libegg/eggtreemultidnd.c: * cut-n-paste-code/libegg/eggtreemultidnd.h: * libnautilus-extension/nautilus-menu.c: * libnautilus-private/nautilus-directory-notify.h: * libnautilus-private/nautilus-file-operations.c: * libnautilus-private/nautilus-file.c: * libnautilus-private/nautilus-icon-info.h: * libnautilus-private/nautilus-idle-queue.h: * libnautilus-private/nautilus-monitor.h: * libnautilus-private/nautilus-search-engine-simple.c: * src/file-manager/fm-list-model.c: * src/file-manager/fm-list-model.h: * src/file-manager/fm-list-view.c: * src/nautilus-emblem-sidebar.h: * src/nautilus-notebook.c: * src/nautilus-notebook.h: Use single GLib/GTK+ includes. Patch by Maxim Ermilov (#560432). svn path=/trunk/; revision=14797
This commit is contained in:
parent
f2c6d6fddf
commit
7fce8f06d6
20
ChangeLog
20
ChangeLog
|
@ -1,3 +1,23 @@
|
|||
2008-12-06 Cosimo Cecchi <cosimoc@gnome.org>
|
||||
|
||||
* cut-n-paste-code/libegg/eggtreemultidnd.c:
|
||||
* cut-n-paste-code/libegg/eggtreemultidnd.h:
|
||||
* libnautilus-extension/nautilus-menu.c:
|
||||
* libnautilus-private/nautilus-directory-notify.h:
|
||||
* libnautilus-private/nautilus-file-operations.c:
|
||||
* libnautilus-private/nautilus-file.c:
|
||||
* libnautilus-private/nautilus-icon-info.h:
|
||||
* libnautilus-private/nautilus-idle-queue.h:
|
||||
* libnautilus-private/nautilus-monitor.h:
|
||||
* libnautilus-private/nautilus-search-engine-simple.c:
|
||||
* src/file-manager/fm-list-model.c:
|
||||
* src/file-manager/fm-list-model.h:
|
||||
* src/file-manager/fm-list-view.c:
|
||||
* src/nautilus-emblem-sidebar.h:
|
||||
* src/nautilus-notebook.c:
|
||||
* src/nautilus-notebook.h:
|
||||
Use single GLib/GTK+ includes. Patch by Maxim Ermilov (#560432).
|
||||
|
||||
2008-12-01 Alexander Larsson <alexl@redhat.com>
|
||||
|
||||
* configure.in:
|
||||
|
|
|
@ -18,10 +18,7 @@
|
|||
*/
|
||||
|
||||
#include <string.h>
|
||||
#include <gtk/gtktreeselection.h>
|
||||
#include <gtk/gtksignal.h>
|
||||
#include <gtk/gtkwidget.h>
|
||||
#include <gtk/gtkmain.h>
|
||||
#include <gtk/gtk.h>
|
||||
#include "eggtreemultidnd.h"
|
||||
|
||||
#define EGG_TREE_MULTI_DND_STRING "EggTreeMultiDndString"
|
||||
|
|
|
@ -20,9 +20,7 @@
|
|||
#ifndef __EGG_TREE_MULTI_DND_H__
|
||||
#define __EGG_TREE_MULTI_DND_H__
|
||||
|
||||
#include <gtk/gtktreemodel.h>
|
||||
#include <gtk/gtktreeview.h>
|
||||
#include <gtk/gtkdnd.h>
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
#include "nautilus-menu.h"
|
||||
#include "nautilus-extension-i18n.h"
|
||||
|
||||
#include <glib/glist.h>
|
||||
#include <glib.h>
|
||||
|
||||
#define NAUTILUS_MENU_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NAUTILUS_TYPE_MENU, NautilusMenuPrivate))
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
Author: Darin Adler <darin@bentspoon.com>
|
||||
*/
|
||||
|
||||
#include <gdk/gdktypes.h>
|
||||
#include <gdk/gdk.h>
|
||||
#include <libnautilus-private/nautilus-file.h>
|
||||
|
||||
typedef struct {
|
||||
|
|
|
@ -53,10 +53,10 @@
|
|||
|
||||
#include <glib/gi18n.h>
|
||||
#include <glib/gstdio.h>
|
||||
#include <gdk/gdkdnd.h>
|
||||
#include <gdk/gdk.h>
|
||||
#include <gtk/gtk.h>
|
||||
#include <gio/gio.h>
|
||||
#include <glib/gurifuncs.h>
|
||||
#include <glib.h>
|
||||
#include "nautilus-file-changes-queue.h"
|
||||
#include "nautilus-file-private.h"
|
||||
#include "nautilus-desktop-icon-file.h"
|
||||
|
|
|
@ -58,8 +58,7 @@
|
|||
#include <glib/gi18n.h>
|
||||
#include <glib/gstdio.h>
|
||||
#include <gio/gio.h>
|
||||
#include <glib/gurifuncs.h>
|
||||
#include <glib/gfileutils.h>
|
||||
#include <glib.h>
|
||||
#include <libnautilus-extension/nautilus-file-info.h>
|
||||
#include <libxml/parser.h>
|
||||
#include <pwd.h>
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
#include <glib-object.h>
|
||||
#include <gdk-pixbuf/gdk-pixbuf.h>
|
||||
#include <gdk/gdktypes.h>
|
||||
#include <gdk/gdk.h>
|
||||
#include <gio/gio.h>
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#ifndef NAUTILUS_IDLE_QUEUE_H
|
||||
#define NAUTILUS_IDLE_QUEUE_H
|
||||
|
||||
#include <glib/gtypes.h>
|
||||
#include <glib.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#ifndef NAUTILUS_MONITOR_H
|
||||
#define NAUTILUS_MONITOR_H
|
||||
|
||||
#include <glib/gtypes.h>
|
||||
#include <glib.h>
|
||||
#include <gio/gio.h>
|
||||
|
||||
typedef struct NautilusMonitor NautilusMonitor;
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
#include "nautilus-search-engine-simple.h"
|
||||
|
||||
#include <string.h>
|
||||
#include <glib/gstrfuncs.h>
|
||||
#include <glib.h>
|
||||
#include <eel/eel-gtk-macros.h>
|
||||
#include <eel/eel-glib-extensions.h>
|
||||
#include <gio/gio.h>
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
#include <gtk/gtk.h>
|
||||
#include <glib/gi18n.h>
|
||||
#include <libnautilus-private/nautilus-dnd.h>
|
||||
#include <glib/gsequence.h>
|
||||
#include <glib.h>
|
||||
|
||||
enum {
|
||||
SUBDIRECTORY_UNLOADED,
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
*/
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
#include <gdk/gdkdnd.h>
|
||||
#include <gdk/gdk.h>
|
||||
#include <libnautilus-private/nautilus-file.h>
|
||||
#include <libnautilus-private/nautilus-directory.h>
|
||||
#include <libnautilus-extension/nautilus-column.h>
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
#include <eel/eel-vfs-extensions.h>
|
||||
#include <eel/eel-glib-extensions.h>
|
||||
#include <eel/eel-gtk-macros.h>
|
||||
#include <gdk/gdkcursor.h>
|
||||
#include <gdk/gdk.h>
|
||||
#include <gdk/gdkkeysyms.h>
|
||||
#include <gtk/gtk.h>
|
||||
#include <libegg/eggtreemultidnd.h>
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
#ifndef NAUTILUS_EMBLEM_SIDEBAR_H
|
||||
#define NAUTILUS_EMBLEM_SIDEBAR_H
|
||||
|
||||
#include <gtk/gtkvbox.h>
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
#define NAUTILUS_TYPE_EMBLEM_SIDEBAR \
|
||||
(nautilus_emblem_sidebar_get_type ())
|
||||
|
|
|
@ -36,15 +36,7 @@
|
|||
|
||||
#include <glib/gi18n.h>
|
||||
#include <gio/gio.h>
|
||||
#include <gtk/gtkeventbox.h>
|
||||
#include <gtk/gtkhbox.h>
|
||||
#include <gtk/gtklabel.h>
|
||||
#include <gtk/gtkwidget.h>
|
||||
#include <gtk/gtkstock.h>
|
||||
#include <gtk/gtkimage.h>
|
||||
#include <gtk/gtkbutton.h>
|
||||
#include <gtk/gtkaccelgroup.h>
|
||||
#include <gtk/gtkiconfactory.h>
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
#define TAB_WIDTH_N_CHARS 15
|
||||
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
#define NAUTILUS_NOTEBOOK_H
|
||||
|
||||
#include <glib.h>
|
||||
#include <gtk/gtknotebook.h>
|
||||
#include <gtk/gtk.h>
|
||||
#include "nautilus-window-slot.h"
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
|
Loading…
Reference in a new issue