summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2005-01-24 09:38:55 +0000
committerAlexander Larsson <alexl@src.gnome.org>2005-01-24 09:38:55 +0000
commit65cb0b152c3ff783f2cd9a6d26db1990c02e333f (patch)
treef6435aff80b64db97e0393ae8aacc8d63043cd9e
parent6ed0c2e40222b32107b029f3511f856ae3e20b44 (diff)
downloadnautilus-65cb0b152c3ff783f2cd9a6d26db1990c02e333f.tar.gz
WE WANT THE CHEESEPUFF!!!
2005-01-24 Alexander Larsson <alexl@redhat.com> * src/nautilus-window-menus.c (action_about_nautilus_callback): WE WANT THE CHEESEPUFF!!!
-rw-r--r--ChangeLog5
-rw-r--r--src/nautilus-window-menus.c16
2 files changed, 19 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 115310963..eaa1e996d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2005-01-24 Alexander Larsson <alexl@redhat.com>
+ * src/nautilus-window-menus.c (action_about_nautilus_callback):
+ WE WANT THE CHEESEPUFF!!!
+
+2005-01-24 Alexander Larsson <alexl@redhat.com>
+
* libnautilus-private/nautilus-file-operations.c:
(confirm_empty_trash):
Use warning icon instead of info one.
diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c
index 451dcf252..361428165 100644
--- a/src/nautilus-window-menus.c
+++ b/src/nautilus-window-menus.c
@@ -417,6 +417,8 @@ action_about_nautilus_callback (GtkAction *action,
"59 Temple Place, Suite 330, Boston, MA 02111-1307 USA")
};
gchar *license_trans;
+ char *logo_path;
+ GdkPixbuf *logo;
license_trans = g_strconcat (_(license[0]), "\n\n", _(license[1]), "\n\n",
_(license[2]), "\n\n", NULL);
@@ -429,6 +431,12 @@ action_about_nautilus_callback (GtkAction *action,
* which will be displayed at the bottom of the about
* box to give credit to the translator(s).
*/
+
+ logo_path = nautilus_pixmap_file ("nautilus-launch-icon.png");
+ logo = NULL;
+ if (logo_path != NULL) {
+ logo = gdk_pixbuf_new_from_file (logo_path, NULL);
+ }
g_object_set (about,
"name", _("Nautilus"),
@@ -443,9 +451,13 @@ action_about_nautilus_callback (GtkAction *action,
"authors", authors,
"documenters", documenters,
"translator-credits", _("translator-credits"),
- "logo-icon-name", "gnome-starthere",
+ "logo", logo,
NULL);
-
+
+ if (logo != NULL) {
+ g_object_unref (logo);
+ }
+
gtk_window_set_transient_for (GTK_WINDOW (about), GTK_WINDOW (user_data));
eel_add_weak_pointer (&about);