GNOME.org
 

[gnome-commander/gcmd-1-3] Replacing generic libgnome and lignomeui includes with more specific ones

commit 5ae37c20dc5cc9ff9e113a4e7ab2ca43e053f01f
Author: André Klapper <a9016009 gmx de>
Date:   Fri Apr 9 20:29:45 2010 +0200

    Replacing generic libgnome and lignomeui includes with more specific ones

 libgcmd/libgcmd-deps.h                   |   10 ++++++----
 plugins/cvs/cvs-plugin.cc                |    3 ++-
 plugins/cvs/interface.cc                 |    2 --
 plugins/cvs/parser.h                     |    2 +-
 plugins/fileroller/file-roller-plugin.cc |    1 -
 plugins/test/test-plugin.cc              |    3 ++-
 src/gnome-cmd-about-plugin.cc            |    2 ++
 src/gnome-cmd-con-device.cc              |    2 +-
 src/gnome-cmd-data.cc                    |    3 +--
 src/gnome-cmd-dir-indicator.cc           |    1 +
 src/gnome-cmd-file-list.cc               |    1 +
 src/gnome-cmd-file-popmenu.cc            |    1 +
 src/gnome-cmd-main-menu.cc               |    1 +
 src/gnome-cmd-main-win.cc                |    1 +
 src/gnome-cmd-smb-auth.cc                |    1 +
 src/gnome-cmd-user-actions.cc            |    1 +
 src/intviewer/search-dlg.cc              |    1 -
 src/intviewer/search-progress-dlg.cc     |    1 -
 src/intviewer/viewer-utils.cc            |    3 +--
 src/intviewer/viewer-widget.cc           |    3 ---
 src/intviewer/viewer-window.cc           |    3 ---
 src/ls_colors.cc                         |    1 +
 src/main.cc                              |    1 +
 src/utils.cc                             |    1 +
 src/utils.h                              |    2 ++
 tests/gviewer/search_dlg_test.c          |    2 +-
 tests/gviewer/viewerwindow.c             |    2 +-
 27 files changed, 30 insertions(+), 25 deletions(-)
---
diff --git a/libgcmd/libgcmd-deps.h b/libgcmd/libgcmd-deps.h
index 218fb25..6206e4e 100644
--- a/libgcmd/libgcmd-deps.h
+++ b/libgcmd/libgcmd-deps.h
@@ -22,13 +22,15 @@
 #define __LIBGCMD_DEPS_H__
 
 #include <glib.h>
-
+#include <glib/gi18n.h>
 #include <gdk/gdk.h>
+#include <gdk/gdkkeysyms.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gtk/gtk.h>
-#include <libgnome/libgnome.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/libgnomeui.h>
+#include <libgnome/gnome-config.h>
+#include <libgnome/gnome-exec.h>
+#include <libgnomeui/gnome-app-helper.h>
+#include <libgnomeui/gnome-icon-entry.h>
 #include <libgnomevfs/gnome-vfs.h>
 #include <libgnomevfs/gnome-vfs-mime-handlers.h>
 
diff --git a/plugins/cvs/cvs-plugin.cc b/plugins/cvs/cvs-plugin.cc
index 8300a95..9babc83 100644
--- a/plugins/cvs/cvs-plugin.cc
+++ b/plugins/cvs/cvs-plugin.cc
@@ -19,7 +19,8 @@
 */
 
 #include <config.h>
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <libgnomeui/gnome-dialog-util.h>
 #include <libgcmd/libgcmd.h>
 #include "cvs-plugin.h"
 #include "cvs-plugin.xpm"
diff --git a/plugins/cvs/interface.cc b/plugins/cvs/interface.cc
index 3127093..7128797 100644
--- a/plugins/cvs/interface.cc
+++ b/plugins/cvs/interface.cc
@@ -27,8 +27,6 @@
 #include <unistd.h>
 #include <string.h>
 
-#include <gnome.h>
-
 #include <libgcmd/libgcmd.h>
 #include "cvs-plugin.h"
 #include "interface.h"
diff --git a/plugins/cvs/parser.h b/plugins/cvs/parser.h
index 1b43106..6f28be9 100644
--- a/plugins/cvs/parser.h
+++ b/plugins/cvs/parser.h
@@ -21,7 +21,7 @@
 #ifndef __PARSER_H__
 #define __PARSER_H__
 
-#include <gnome.h>
+#include <glib.h>
 
 typedef struct {
     gchar *number;
diff --git a/plugins/fileroller/file-roller-plugin.cc b/plugins/fileroller/file-roller-plugin.cc
index 5e21eba..e120a03 100644
--- a/plugins/fileroller/file-roller-plugin.cc
+++ b/plugins/fileroller/file-roller-plugin.cc
@@ -19,7 +19,6 @@
 */
 
 #include <config.h>
-#include <gnome.h>
 #include <libgcmd/libgcmd.h>
 #include "file-roller-plugin.h"
 #include "file-roller.xpm"
diff --git a/plugins/test/test-plugin.cc b/plugins/test/test-plugin.cc
index d822c3c..158e7ee 100644
--- a/plugins/test/test-plugin.cc
+++ b/plugins/test/test-plugin.cc
@@ -19,7 +19,8 @@
 */
 
 #include <config.h>
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <libgnomeui/gnome-dialog-util.h>
 #include <libgcmd/libgcmd.h>
 #include "test-plugin.h"
 #include "test-plugin.xpm"
diff --git a/src/gnome-cmd-about-plugin.cc b/src/gnome-cmd-about-plugin.cc
index 7b18c4a..cd3eb8c 100644
--- a/src/gnome-cmd-about-plugin.cc
+++ b/src/gnome-cmd-about-plugin.cc
@@ -27,6 +27,8 @@
 */
 
 #include <config.h>
+#include <libgnomeui/gnome-href.h>
+#include <libgnomeui/gnome-stock-icons.h>
 
 #include "gnome-cmd-includes.h"
 #include "gnome-cmd-about-plugin.h"
diff --git a/src/gnome-cmd-con-device.cc b/src/gnome-cmd-con-device.cc
index a0b6bb3..a757f29 100644
--- a/src/gnome-cmd-con-device.cc
+++ b/src/gnome-cmd-con-device.cc
@@ -19,9 +19,9 @@
 */
 
 #include <config.h>
+#include <stdlib.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <libgnomevfs/gnome-vfs.h>
 #include <libgnomevfs/gnome-vfs-volume.h>
 
 #include "gnome-cmd-includes.h"
diff --git a/src/gnome-cmd-data.cc b/src/gnome-cmd-data.cc
index 16aa5ac..72c5b86 100644
--- a/src/gnome-cmd-data.cc
+++ b/src/gnome-cmd-data.cc
@@ -19,9 +19,8 @@
 */
 
 #include <config.h>
-#include <libgnomevfs/gnome-vfs.h>
-#include <libgnomevfs/gnome-vfs-volume-monitor.h>
 #include <libgnomevfs/gnome-vfs-volume.h>
+#include <libgnomevfs/gnome-vfs-volume-monitor.h>
 
 #include <fstream>
 
diff --git a/src/gnome-cmd-dir-indicator.cc b/src/gnome-cmd-dir-indicator.cc
index bff111f..d1cef99 100644
--- a/src/gnome-cmd-dir-indicator.cc
+++ b/src/gnome-cmd-dir-indicator.cc
@@ -19,6 +19,7 @@
 */
 
 #include <config.h>
+#include <libgnomeui/gnome-popup-menu.h>
 
 #include "gnome-cmd-includes.h"
 #include "gnome-cmd-dir-indicator.h"
diff --git a/src/gnome-cmd-file-list.cc b/src/gnome-cmd-file-list.cc
index 052730e..54fe6f0 100644
--- a/src/gnome-cmd-file-list.cc
+++ b/src/gnome-cmd-file-list.cc
@@ -20,6 +20,7 @@
 
 #include <config.h>
 #include <glib-object.h>
+#include <libgnomeui/gnome-popup-menu.h>
 
 #include "gnome-cmd-includes.h"
 #include "gnome-cmd-file-selector.h"
diff --git a/src/gnome-cmd-file-popmenu.cc b/src/gnome-cmd-file-popmenu.cc
index 877bbdd..d2188c6 100644
--- a/src/gnome-cmd-file-popmenu.cc
+++ b/src/gnome-cmd-file-popmenu.cc
@@ -19,6 +19,7 @@
 */
 
 #include <config.h>
+#include <libgnomeui/gnome-stock-icons.h>
 
 #include "gnome-cmd-includes.h"
 #include "gnome-cmd-file-popmenu.h"
diff --git a/src/gnome-cmd-main-menu.cc b/src/gnome-cmd-main-menu.cc
index ac5b53a..7ce3fd7 100644
--- a/src/gnome-cmd-main-menu.cc
+++ b/src/gnome-cmd-main-menu.cc
@@ -19,6 +19,7 @@
 */
 
 #include <config.h>
+#include <libgnomeui/gnome-stock-icons.h>
 
 #include "gnome-cmd-includes.h"
 #include "gnome-cmd-main-menu.h"
diff --git a/src/gnome-cmd-main-win.cc b/src/gnome-cmd-main-win.cc
index 8587082..754c2e1 100644
--- a/src/gnome-cmd-main-win.cc
+++ b/src/gnome-cmd-main-win.cc
@@ -23,6 +23,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <glib/gstdio.h>
+#include <libgnomeui/gnome-stock-icons.h>
 
 #include "gnome-cmd-includes.h"
 #include "gnome-cmd-cmdline.h"
diff --git a/src/gnome-cmd-smb-auth.cc b/src/gnome-cmd-smb-auth.cc
index 96b1808..ea2a397 100644
--- a/src/gnome-cmd-smb-auth.cc
+++ b/src/gnome-cmd-smb-auth.cc
@@ -19,6 +19,7 @@
 */
 
 #include <config.h>
+#include <libgnomeui/gnome-password-dialog.h>
 #include <libgnomevfs/gnome-vfs-module-callback.h>
 
 #include "gnome-cmd-includes.h"
diff --git a/src/gnome-cmd-user-actions.cc b/src/gnome-cmd-user-actions.cc
index 021a68d..d70cb05 100644
--- a/src/gnome-cmd-user-actions.cc
+++ b/src/gnome-cmd-user-actions.cc
@@ -20,6 +20,7 @@
 
 #include <config.h>
 #include <gtk/gtkclipboard.h>
+#include <libgnomeui/gnome-url.h>
 #include <algorithm>
 
 #include "gnome-cmd-includes.h"
diff --git a/src/intviewer/search-dlg.cc b/src/intviewer/search-dlg.cc
index 3cbb142..ebdaa9b 100644
--- a/src/intviewer/search-dlg.cc
+++ b/src/intviewer/search-dlg.cc
@@ -24,7 +24,6 @@
 
 #include <config.h>
 #include <string.h>
-#include <libgnome/libgnome.h>
 
 #include "libgviewer.h"
 #include "gnome-cmd-includes.h"
diff --git a/src/intviewer/search-progress-dlg.cc b/src/intviewer/search-progress-dlg.cc
index 602d142..4525a6b 100644
--- a/src/intviewer/search-progress-dlg.cc
+++ b/src/intviewer/search-progress-dlg.cc
@@ -23,7 +23,6 @@
 */
 
 #include <config.h>
-#include <libgnome/libgnome.h>
 
 #include "libgviewer.h"
 
diff --git a/src/intviewer/viewer-utils.cc b/src/intviewer/viewer-utils.cc
index a9a97e4..53dfa5e 100644
--- a/src/intviewer/viewer-utils.cc
+++ b/src/intviewer/viewer-utils.cc
@@ -24,8 +24,7 @@
 
 #include <config.h>
 #include <glib.h>
-#include <libgnomeui/libgnomeui.h>
-#include <libgnome/libgnome.h>
+#include <libgnome/gnome-config.h>
 
 #include "gvtypes.h"
 #include "viewer-utils.h"
diff --git a/src/intviewer/viewer-widget.cc b/src/intviewer/viewer-widget.cc
index 16fbe14..43f1458 100644
--- a/src/intviewer/viewer-widget.cc
+++ b/src/intviewer/viewer-widget.cc
@@ -35,9 +35,6 @@
 #include <gtk/gtktable.h>
 #include <gtk/gtkmarshal.h>
 
-#include <libgnome/libgnome.h>
-#include <libgnomevfs/gnome-vfs.h>
-
 #include "libgviewer.h"
 #include "gnome-cmd-includes.h"
 #include "gnome-cmd-file.h"
diff --git a/src/intviewer/viewer-window.cc b/src/intviewer/viewer-window.cc
index d1af187..9d6f7eb 100644
--- a/src/intviewer/viewer-window.cc
+++ b/src/intviewer/viewer-window.cc
@@ -31,9 +31,6 @@
 #include <gtk/gtk.h>
 #include <gtk/gtktable.h>
 
-#include <libgnomeui/libgnomeui.h>
-#include <libgnome/libgnome.h>
-
 #include "libgviewer.h"
 #include "search-dlg.h"
 
diff --git a/src/ls_colors.cc b/src/ls_colors.cc
index bf253db..a2f1f10 100644
--- a/src/ls_colors.cc
+++ b/src/ls_colors.cc
@@ -19,6 +19,7 @@
 */
 
 #include <config.h>
+#include <stdlib.h>
 
 #include "gnome-cmd-includes.h"
 #include "ls_colors.h"
diff --git a/src/main.cc b/src/main.cc
index a75e8f3..9ae3487 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -26,6 +26,7 @@ extern "C"
 #include <config.h>
 #include <locale.h>
 #include <unique/unique.h>
+#include <libgnomeui/gnome-ui-init.h>
 
 #include "gnome-cmd-includes.h"
 #include "gnome-cmd-main-win.h"
diff --git a/src/utils.cc b/src/utils.cc
index 12c5981..04985f0 100644
--- a/src/utils.cc
+++ b/src/utils.cc
@@ -23,6 +23,7 @@
 #include <errno.h>
 #include <dirent.h>
 #include <fnmatch.h>
+#include <stdlib.h>
 
 #include <set>
 
diff --git a/src/utils.h b/src/utils.h
index 8978f6d..cf93970 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -28,6 +28,8 @@
 
 #include <stdio.h>
 
+#include <libgnome/gnome-help.h>
+
 #include "gnome-cmd-file.h"
 #include "gnome-cmd-types.h"
 #include "gnome-cmd-pixmap.h"
diff --git a/tests/gviewer/search_dlg_test.c b/tests/gviewer/search_dlg_test.c
index 5f40288..2168534 100644
--- a/tests/gviewer/search_dlg_test.c
+++ b/tests/gviewer/search_dlg_test.c
@@ -28,7 +28,7 @@
 
 #include <glib.h>
 #include <gtk/gtk.h>
-#include <libgnomeui/libgnomeui.h>
+#include <libgnomeui/gnome-ui-init.h>
 
 #include <config.h>
 
diff --git a/tests/gviewer/viewerwindow.c b/tests/gviewer/viewerwindow.c
index 50f3b7e..0fe1cfc 100644
--- a/tests/gviewer/viewerwindow.c
+++ b/tests/gviewer/viewerwindow.c
@@ -32,7 +32,7 @@
 #include <config.h>
 
 #include <libgviewer/libgviewer.h>
-#include <libgnomeui/libgnomeui.h>
+#include <libgnomeui/gnome-ui-init.h>
 
 
 static void destroy(GObject *a, gpointer data)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]