GNOME.org
 

[PATCH] Remove useless libgnome includes.

---
 libnautilus-private/nautilus-customization-data.c |    1 -
 libnautilus-private/nautilus-dnd.c                |    1 -
 libnautilus-private/nautilus-file-utilities.c     |    1 -
 libnautilus-private/nautilus-file.c               |    1 -
 libnautilus-private/nautilus-global-preferences.c |    1 -
 libnautilus-private/nautilus-icon-dnd.c           |    2 --
 libnautilus-private/nautilus-icon-private.h       |    1 -
 libnautilus-private/nautilus-monitor.c            |    1 -
 src/file-manager/fm-desktop-icon-view.c           |    1 -
 src/file-manager/fm-ditem-page.c                  |    1 -
 src/file-manager/fm-error-reporting.h             |    1 -
 src/file-manager/fm-list-view.c                   |    1 -
 src/file-manager/fm-properties-window.c           |    1 +
 src/nautilus-history-sidebar.c                    |    1 -
 src/nautilus-image-properties-page.c              |    1 -
 src/nautilus-information-panel.c                  |    7 +++----
 src/nautilus-location-bar.c                       |    8 ++------
 src/nautilus-location-entry.c                     |    3 +--
 src/nautilus-main.c                               |    3 ---
 src/nautilus-navigation-window-menus.c            |    4 ----
 src/nautilus-navigation-window.c                  |    9 ++++-----
 src/nautilus-places-sidebar.c                     |    2 --
 src/nautilus-window-manage-views.c                |    1 -
 src/nautilus-window-toolbars.c                    |    1 -
 24 files changed, 11 insertions(+), 43 deletions(-)

diff --git a/libnautilus-private/nautilus-customization-data.c b/libnautilus-private/nautilus-customization-data.c
index c6ebcc7..e3a3844 100644
--- a/libnautilus-private/nautilus-customization-data.c
+++ b/libnautilus-private/nautilus-customization-data.c
@@ -43,7 +43,6 @@
 #include <gtk/gtk.h>
 #include <librsvg/rsvg.h>
 #include <glib/gi18n.h>
-#include <libgnome/gnome-util.h>
 #include <libxml/parser.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/libnautilus-private/nautilus-dnd.c b/libnautilus-private/nautilus-dnd.c
index f05dd13..2545c21 100644
--- a/libnautilus-private/nautilus-dnd.c
+++ b/libnautilus-private/nautilus-dnd.c
@@ -40,7 +40,6 @@
 #include <eel/eel-vfs-extensions.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <libgnomeui/gnome-uidefs.h>
 #include <libnautilus-private/nautilus-file-utilities.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/libnautilus-private/nautilus-file-utilities.c b/libnautilus-private/nautilus-file-utilities.c
index 65e0d1f..b3ccc53 100644
--- a/libnautilus-private/nautilus-file-utilities.c
+++ b/libnautilus-private/nautilus-file-utilities.c
@@ -35,7 +35,6 @@
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-string.h>
 #include <eel/eel-debug.h>
-#include <libgnome/gnome-util.h>
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
index de25d27..5bbcf72 100644
--- a/libnautilus-private/nautilus-file.c
+++ b/libnautilus-private/nautilus-file.c
@@ -59,7 +59,6 @@
 #include <glib/gstdio.h>
 #include <gio/gio.h>
 #include <glib/gurifuncs.h>
-#include <libgnome/gnome-macros.h>
 #include <glib/gfileutils.h>
 #include <libnautilus-extension/nautilus-file-info.h>
 #include <libxml/parser.h>
diff --git a/libnautilus-private/nautilus-global-preferences.c b/libnautilus-private/nautilus-global-preferences.c
index e1f8813..f479de3 100644
--- a/libnautilus-private/nautilus-global-preferences.c
+++ b/libnautilus-private/nautilus-global-preferences.c
@@ -34,7 +34,6 @@
 #include <eel/eel-stock-dialogs.h>
 #include <eel/eel-string.h>
 #include <glib/gi18n.h>
-#include <libgnome/gnome-util.h>
 
 /* Constants */
 #define STRING_ARRAY_DEFAULT_TOKENS_DELIMETER ","
diff --git a/libnautilus-private/nautilus-icon-dnd.c b/libnautilus-private/nautilus-icon-dnd.c
index 86dcf43..e2ad56c 100644
--- a/libnautilus-private/nautilus-icon-dnd.c
+++ b/libnautilus-private/nautilus-icon-dnd.c
@@ -55,8 +55,6 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <eel/eel-canvas-rect-ellipse.h>
-#include <libgnomeui/gnome-stock-icons.h>
-#include <libgnomeui/gnome-uidefs.h>
 #include <libnautilus-private/nautilus-file-utilities.h>
 #include <libnautilus-private/nautilus-file-changes-queue.h>
 #include <stdio.h>
diff --git a/libnautilus-private/nautilus-icon-private.h b/libnautilus-private/nautilus-icon-private.h
index 58dda99..d1a96fc 100644
--- a/libnautilus-private/nautilus-icon-private.h
+++ b/libnautilus-private/nautilus-icon-private.h
@@ -26,7 +26,6 @@
 #define NAUTILUS_ICON_CONTAINER_PRIVATE_H
 
 #include <eel/eel-glib-extensions.h>
-#include <libgnomeui/gnome-icon-item.h>
 #include <libnautilus-private/nautilus-icon-canvas-item.h>
 #include <libnautilus-private/nautilus-icon-container.h>
 #include <libnautilus-private/nautilus-icon-dnd.h>
diff --git a/libnautilus-private/nautilus-monitor.c b/libnautilus-private/nautilus-monitor.c
index 63862ca..906d73c 100644
--- a/libnautilus-private/nautilus-monitor.c
+++ b/libnautilus-private/nautilus-monitor.c
@@ -30,7 +30,6 @@
 #include "nautilus-file-utilities.h"
 
 #include <gio/gio.h>
-#include <libgnome/gnome-util.h>
 
 struct NautilusMonitor {
 	GFileMonitor *monitor;
diff --git a/src/file-manager/fm-desktop-icon-view.c b/src/file-manager/fm-desktop-icon-view.c
index c7f30f6..129b817 100644
--- a/src/file-manager/fm-desktop-icon-view.c
+++ b/src/file-manager/fm-desktop-icon-view.c
@@ -42,7 +42,6 @@
 #include <fcntl.h>
 #include <gdk/gdkx.h>
 #include <glib/gi18n.h>
-#include <libgnome/gnome-util.h>
 #include <libnautilus-private/nautilus-desktop-icon-file.h>
 #include <libnautilus-private/nautilus-directory-background.h>
 #include <libnautilus-private/nautilus-directory-notify.h>
diff --git a/src/file-manager/fm-ditem-page.c b/src/file-manager/fm-ditem-page.c
index 13a134b..be7f234 100644
--- a/src/file-manager/fm-ditem-page.c
+++ b/src/file-manager/fm-ditem-page.c
@@ -29,7 +29,6 @@
 #include <eel/eel-glib-extensions.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <libgnomeui/gnome-uidefs.h>
 #include <libnautilus-extension/nautilus-extension-types.h>
 #include <libnautilus-extension/nautilus-file-info.h>
 #include <libnautilus-private/nautilus-file.h>
diff --git a/src/file-manager/fm-error-reporting.h b/src/file-manager/fm-error-reporting.h
index ddbdc19..c539af8 100644
--- a/src/file-manager/fm-error-reporting.h
+++ b/src/file-manager/fm-error-reporting.h
@@ -27,7 +27,6 @@
 #define FM_ERROR_REPORTING_H
 
 #include <gtk/gtk.h>
-#include <libgnomevfs/gnome-vfs-types.h>
 #include <libnautilus-private/nautilus-file.h>
 
 void fm_report_error_loading_directory	 (NautilusFile   *file,
diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c
index c2be9af..3143612 100644
--- a/src/file-manager/fm-list-view.c
+++ b/src/file-manager/fm-list-view.c
@@ -41,7 +41,6 @@
 #include <libegg/eggtreemultidnd.h>
 #include <glib/gi18n.h>
 #include <glib-object.h>
-#include <libgnome/gnome-macros.h>
 #include <libnautilus-extension/nautilus-column-provider.h>
 #include <libnautilus-private/nautilus-column-chooser.h>
 #include <libnautilus-private/nautilus-column-utilities.h>
diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index 748f417..fcc6002 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -57,6 +57,7 @@
 #include <libnautilus-private/nautilus-mime-actions.h>
 #include <libnautilus-private/nautilus-undo.h>
 #include <string.h>
+#include <sys/stat.h>
 #include <cairo.h>
 
 #if HAVE_SYS_STATVFS_H
diff --git a/src/nautilus-history-sidebar.c b/src/nautilus-history-sidebar.c
index b9c8b92..b3a1a9e 100644
--- a/src/nautilus-history-sidebar.c
+++ b/src/nautilus-history-sidebar.c
@@ -32,7 +32,6 @@
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-preferences.h>
 #include <gtk/gtk.h>
-#include <libgnome/gnome-macros.h>
 #include <glib/gi18n.h>
 #include <libnautilus-private/nautilus-bookmark.h>
 #include <libnautilus-private/nautilus-global-preferences.h>
diff --git a/src/nautilus-image-properties-page.c b/src/nautilus-image-properties-page.c
index 24e143c..1c82bec 100644
--- a/src/nautilus-image-properties-page.c
+++ b/src/nautilus-image-properties-page.c
@@ -27,7 +27,6 @@
 #include "nautilus-image-properties-page.h"
 
 #include <gtk/gtk.h>
-#include <libgnome/gnome-macros.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 #include <eel/eel-vfs-extensions.h>
diff --git a/src/nautilus-information-panel.c b/src/nautilus-information-panel.c
index 6a603b0..f70f977 100644
--- a/src/nautilus-information-panel.c
+++ b/src/nautilus-information-panel.c
@@ -38,7 +38,6 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <libgnomeui/gnome-uidefs.h>
 #include <libnautilus-private/nautilus-dnd.h>
 #include <libnautilus-private/nautilus-directory.h>
 #include <libnautilus-private/nautilus-file-dnd.h>
@@ -225,8 +224,8 @@ make_button_box (NautilusInformationPanel *information_panel)
 	gtk_box_pack_start_defaults (GTK_BOX (information_panel->details->container),
 			    	     GTK_WIDGET (information_panel->details->button_box_centerer));
 
-	information_panel->details->button_box = GTK_VBOX (nautilus_keep_last_vertical_box_new (GNOME_PAD_SMALL));
-	gtk_container_set_border_width (GTK_CONTAINER (information_panel->details->button_box), GNOME_PAD);				
+	information_panel->details->button_box = GTK_VBOX (nautilus_keep_last_vertical_box_new (4));
+	gtk_container_set_border_width (GTK_CONTAINER (information_panel->details->button_box), 8);				
 	gtk_widget_show (GTK_WIDGET (information_panel->details->button_box));
 	gtk_box_pack_start (GTK_BOX (information_panel->details->button_box_centerer),
 			    GTK_WIDGET (information_panel->details->button_box),
@@ -263,7 +262,7 @@ nautilus_information_panel_init (NautilusInformationPanel *information_panel)
 	gtk_widget_show (GTK_WIDGET (information_panel->details->title));
 	gtk_box_pack_start (GTK_BOX (information_panel->details->container),
 			    GTK_WIDGET (information_panel->details->title),
-			    FALSE, FALSE, GNOME_PAD);
+			    FALSE, FALSE, 8);
 	
 	/* allocate and install the command button container */
 	make_button_box (information_panel);
diff --git a/src/nautilus-location-bar.c b/src/nautilus-location-bar.c
index 89b55d4..63faf77 100644
--- a/src/nautilus-location-bar.c
+++ b/src/nautilus-location-bar.c
@@ -44,8 +44,6 @@
 #include <eel/eel-vfs-extensions.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <libgnomeui/gnome-stock-icons.h>
-#include <libgnomeui/gnome-uidefs.h>
 #include <libnautilus-private/nautilus-icon-dnd.h>
 #include <libnautilus-private/nautilus-clipboard.h>
 #include <stdio.h>
@@ -417,8 +415,7 @@ nautilus_location_bar_init (NautilusLocationBar *bar)
 	event_box = gtk_event_box_new ();
 	gtk_event_box_set_visible_window (GTK_EVENT_BOX (event_box), FALSE);
 	
-	gtk_container_set_border_width (GTK_CONTAINER (event_box),
-					GNOME_PAD_SMALL);
+	gtk_container_set_border_width (GTK_CONTAINER (event_box), 4);
 	label = gtk_label_new (LOCATION_LABEL);
 	gtk_container_add   (GTK_CONTAINER (event_box), label);
 	gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_RIGHT);
@@ -426,8 +423,7 @@ nautilus_location_bar_init (NautilusLocationBar *bar)
 	g_signal_connect (label, "style_set", 
 			  G_CALLBACK (style_set_handler), NULL);
 
-	gtk_box_pack_start (GTK_BOX (hbox), event_box, FALSE, TRUE,
-			    GNOME_PAD_SMALL);
+	gtk_box_pack_start (GTK_BOX (hbox), event_box, FALSE, TRUE, 4);
 
 	entry = nautilus_location_entry_new ();
 	
diff --git a/src/nautilus-location-entry.c b/src/nautilus-location-entry.c
index c253fba..247eafd 100644
--- a/src/nautilus-location-entry.c
+++ b/src/nautilus-location-entry.c
@@ -40,10 +40,9 @@
 #include <eel/eel-stock-dialogs.h>
 #include <eel/eel-string.h>
 #include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
-#include <libgnomeui/gnome-stock-icons.h>
-#include <libgnomeui/gnome-uidefs.h>
 #include <libnautilus-private/nautilus-file-utilities.h>
 #include <libnautilus-private/nautilus-entry.h>
 #include <libnautilus-private/nautilus-icon-dnd.h>
diff --git a/src/nautilus-main.c b/src/nautilus-main.c
index 0d2ecba..e8d728b 100644
--- a/src/nautilus-main.c
+++ b/src/nautilus-main.c
@@ -45,9 +45,6 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <gio/gdesktopappinfo.h>
-#include <libgnome/gnome-init.h>
-#include <libgnomeui/gnome-ui-init.h>
-#include <libgnomeui/gnome-client.h>
 #include <libnautilus-private/nautilus-debug-log.h>
 #include <libnautilus-private/nautilus-directory-metafile.h>
 #include <libnautilus-private/nautilus-global-preferences.h>
diff --git a/src/nautilus-navigation-window-menus.c b/src/nautilus-navigation-window-menus.c
index 2abd6ef..89bd1f6 100644
--- a/src/nautilus-navigation-window-menus.c
+++ b/src/nautilus-navigation-window-menus.c
@@ -47,11 +47,7 @@
 #include <eel/eel-xml-extensions.h>
 #include <libxml/parser.h>
 #include <gtk/gtk.h>
-#include <libgnome/gnome-help.h>
 #include <glib/gi18n.h>
-#include <libgnome/gnome-util.h>
-#include <libgnomeui/gnome-about.h>
-#include <libgnomeui/gnome-uidefs.h>
 #include <libnautilus-private/nautilus-file-utilities.h>
 #include <libnautilus-private/nautilus-global-preferences.h>
 #include <libnautilus-private/nautilus-ui-utilities.h>
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index c49b08f..d0505d2 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -53,7 +53,6 @@
 #ifdef HAVE_X11_XF86KEYSYM_H
 #include <X11/XF86keysym.h>
 #endif
-#include <libgnomeui/gnome-uidefs.h>
 #include <libnautilus-private/nautilus-file-utilities.h>
 #include <libnautilus-private/nautilus-file-attributes.h>
 #include <libnautilus-private/nautilus-global-preferences.h>
@@ -409,7 +408,7 @@ nautilus_navigation_window_init (NautilusNavigationWindow *window)
 	gtk_widget_show (hbox);
 
 	item = gtk_tool_item_new ();
-	gtk_container_set_border_width (GTK_CONTAINER (item), GNOME_PAD_SMALL);
+	gtk_container_set_border_width (GTK_CONTAINER (item), 4);
 	gtk_widget_show (GTK_WIDGET (item));
 	gtk_tool_item_set_expand (item, TRUE);
 	gtk_container_add (GTK_CONTAINER (item),  hbox);
@@ -454,11 +453,11 @@ nautilus_navigation_window_init (NautilusNavigationWindow *window)
 	/* Option menu for content view types; it's empty here, filled in when a uri is set.
 	 * Pack it into vbox so it doesn't grow vertically when location bar does. 
 	 */
-	view_as_menu_vbox = gtk_vbox_new (FALSE, GNOME_PAD_SMALL);
+	view_as_menu_vbox = gtk_vbox_new (FALSE, 4);
 	gtk_widget_show (view_as_menu_vbox);
 
 	item = gtk_tool_item_new ();
-	gtk_container_set_border_width (GTK_CONTAINER (item), GNOME_PAD_SMALL);
+	gtk_container_set_border_width (GTK_CONTAINER (item), 4);
 	gtk_widget_show (GTK_WIDGET (item));
 	gtk_container_add (GTK_CONTAINER (item), view_as_menu_vbox);
 	gtk_toolbar_insert (GTK_TOOLBAR (location_bar),
@@ -489,7 +488,7 @@ nautilus_navigation_window_init (NautilusNavigationWindow *window)
 				 window, G_CONNECT_SWAPPED);
 	
 	item = gtk_tool_item_new ();
-	gtk_container_set_border_width (GTK_CONTAINER (item), GNOME_PAD_SMALL);
+	gtk_container_set_border_width (GTK_CONTAINER (item), 4);
 	gtk_widget_show (GTK_WIDGET (item));
 	gtk_container_add (GTK_CONTAINER (item),  window->zoom_control);
 	gtk_toolbar_insert (GTK_TOOLBAR (location_bar),
diff --git a/src/nautilus-places-sidebar.c b/src/nautilus-places-sidebar.c
index 6ade15c..467475d 100644
--- a/src/nautilus-places-sidebar.c
+++ b/src/nautilus-places-sidebar.c
@@ -31,9 +31,7 @@
 #include <eel/eel-stock-dialogs.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
-#include <libgnome/gnome-macros.h>
 #include <glib/gi18n.h>
-#include <libgnomeui/gnome-popup-menu.h>
 #include <libnautilus-private/nautilus-debug-log.h>
 #include <libnautilus-private/nautilus-dnd.h>
 #include <libnautilus-private/nautilus-bookmark.h>
diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c
index ed40a64..a064356 100644
--- a/src/nautilus-window-manage-views.c
+++ b/src/nautilus-window-manage-views.c
@@ -52,7 +52,6 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 #include <glib/gi18n.h>
-#include <libgnomeui/gnome-icon-theme.h>
 #include <libnautilus-extension/nautilus-location-widget-provider.h>
 #include <libnautilus-private/nautilus-debug-log.h>
 #include <libnautilus-private/nautilus-file-attributes.h>
diff --git a/src/nautilus-window-toolbars.c b/src/nautilus-window-toolbars.c
index d68431f..7d0d26a 100644
--- a/src/nautilus-window-toolbars.c
+++ b/src/nautilus-window-toolbars.c
@@ -40,7 +40,6 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
-#include <libgnomeui/gnome-popup-menu.h>
 #include <libnautilus-extension/nautilus-menu-provider.h>
 #include <libnautilus-private/nautilus-bookmark.h>
 #include <libnautilus-private/nautilus-file-utilities.h>
-- 
1.5.6.3


--=-cwoC+2EGDZPZCOegStbI--
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]