diff options
| author | Marco Pesenti Gritti <marco@gnome.org> | 2003-11-07 00:10:19 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@src.gnome.org> | 2003-11-07 00:10:19 +0800 |
| commit | b5c036538ffb6fbb2ace518ee5b4ad8b2d5c8ef6 (patch) | |
| tree | cde40f3eb7d416345a1f514e93f974e5834a4727 /src | |
| parent | e8efae29aefaf2ab8c549fc298b6564f697f1de1 (diff) | |
| download | gsoc2013-epiphany-b5c036538ffb6fbb2ace518ee5b4ad8b2d5c8ef6.tar gsoc2013-epiphany-b5c036538ffb6fbb2ace518ee5b4ad8b2d5c8ef6.tar.gz gsoc2013-epiphany-b5c036538ffb6fbb2ace518ee5b4ad8b2d5c8ef6.tar.bz2 gsoc2013-epiphany-b5c036538ffb6fbb2ace518ee5b4ad8b2d5c8ef6.tar.lz gsoc2013-epiphany-b5c036538ffb6fbb2ace518ee5b4ad8b2d5c8ef6.tar.xz gsoc2013-epiphany-b5c036538ffb6fbb2ace518ee5b4ad8b2d5c8ef6.tar.zst gsoc2013-epiphany-b5c036538ffb6fbb2ace518ee5b4ad8b2d5c8ef6.zip | |
More headers fixup.
2003-11-06 Marco Pesenti Gritti <marco@gnome.org>
* src/ephy-main.c:
* src/ephy-shell.c:
More headers fixup.
* src/window-commands.c: (window_cmd_help_about):
Use gtk icon theme here too.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ephy-main.c | 6 | ||||
| -rw-r--r-- | src/ephy-shell.c | 2 | ||||
| -rw-r--r-- | src/window-commands.c | 22 |
3 files changed, 16 insertions, 14 deletions
diff --git a/src/ephy-main.c b/src/ephy-main.c index 6ca4209ed..5bd37115d 100644 --- a/src/ephy-main.c +++ b/src/ephy-main.c @@ -26,10 +26,10 @@ #include "ephy-file-helpers.h" #include "EphyAutomation.h" -#include <libbonoboui.h> -#include <libgnome/gnome-program.h> #include <libgnomeui/gnome-ui-init.h> -#include <gtk/gtkwindow.h> +#include <gtk/gtkmessagedialog.h> +#include <libgnome/gnome-program.h> +#include <bonobo/bonobo-main.h> #define EPHY_FACTORY_OAFIID "OAFIID:GNOME_Epiphany_Automation_Factory" diff --git a/src/ephy-shell.c b/src/ephy-shell.c index d589c2ad4..a2e825372 100644 --- a/src/ephy-shell.c +++ b/src/ephy-shell.c @@ -44,13 +44,13 @@ #include "ephy-automation.h" #include <string.h> -#include <libgnomeui/gnome-client.h> #include <bonobo/bonobo-main.h> #include <glib/gi18n.h> #include <gtk/gtksignal.h> #include <gtk/gtkmain.h> #include <gtk/gtkmessagedialog.h> #include <dirent.h> +#include <unistd.h> #include <libgnomevfs/gnome-vfs-init.h> #include <gtk/gtkicontheme.h> #include <glade/glade-init.h> diff --git a/src/window-commands.c b/src/window-commands.c index ab51a8eb0..0a45af31e 100644 --- a/src/window-commands.c +++ b/src/window-commands.c @@ -51,8 +51,6 @@ #include <glib/gi18n.h> #include <libgnomeui/gnome-about.h> #include <libgnomeui/gnome-stock-icons.h> -#include <libgnomeui/gnome-icon-theme.h> -#include <libgnome/gnome-program.h> #include <libgnomevfs/gnome-vfs-mime-handlers.h> #include <gtk/gtkeditable.h> #include <gtk/gtktoggleaction.h> @@ -897,9 +895,10 @@ window_cmd_help_about (GtkAction *action, static GtkWidget *about = NULL; GtkWidget** ptr; GdkPixbuf *icon; - char *icon_path; + const char *icon_path; GdkPixbuf *logo; - GnomeIconTheme *icon_theme; + GtkIconTheme *icon_theme; + GtkIconInfo *icon_info; static gchar *authors[] = { "Marco Pesenti Gritti <marco@gnome.org>", @@ -925,15 +924,16 @@ window_cmd_help_about (GtkAction *action, return; } - icon_theme = gnome_icon_theme_new (); - icon_path = gnome_icon_theme_lookup_icon (icon_theme, "web-browser", - -1, NULL, NULL); - g_object_unref (icon_theme); + icon_theme = gtk_icon_theme_get_default (); + icon_info = gtk_icon_theme_lookup_icon (icon_theme, "web-browser", -1, 0); - if (icon_path) + if (icon_info) { + + icon_path = gtk_icon_info_get_filename (icon_info); + g_return_if_fail (icon_path != NULL); + logo = gdk_pixbuf_new_from_file (icon_path, NULL); - g_free (icon_path); } else { @@ -941,6 +941,8 @@ window_cmd_help_about (GtkAction *action, g_warning ("Web browser gnome icon not found"); } + g_object_unref (icon_theme); + about = gnome_about_new( "Epiphany", VERSION, "Copyright \xc2\xa9 2002-2003 Marco Pesenti Gritti", |