Add a function to get the default window icon name

svn path=/trunk/; revision=22387

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 878e3d917eaab2783eb9a2a4d62de4ced00dfba1..879ee8c0cf7f49cba63d0ec6bf22270740b0b996 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,7 @@
+2009-02-20  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtk-sections.txt: Add gtk_window_get_default_icon_name
+
 2009-02-17  Matthias Clasen  <mclasen@redhat.com>
 
        * === Released 2.15.4 ===

diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt
index 4dd55d085f18131a77d4e2257b3c6218dcf8e243..5ce7e395aabc907eed66b37dbf16e28872737ece 100644 (file)
--- a/docs/reference/gtk/gtk-sections.txt
+++ b/docs/reference/gtk/gtk-sections.txt
@@ -5577,6 +5577,7 @@ gtk_window_set_role
 gtk_window_get_decorated
 gtk_window_get_deletable
 gtk_window_get_default_icon_list
+gtk_window_get_default_icon_name
 gtk_window_get_default_size
 gtk_window_get_destroy_with_parent
 gtk_window_get_frame_dimensions

diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index 53bcc5e23de3acf8aca3c27e0b878b7e83fc250f..806e9bef0fe22a18ee20df165ee0f06192ee49b8 100644 (file)
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -5038,6 +5038,7 @@ gtk_window_get_decorated
 gtk_window_get_deletable
 gtk_window_get_default_widget
 gtk_window_get_default_icon_list
+gtk_window_get_default_icon_name
 gtk_window_get_default_size
 gtk_window_get_destroy_with_parent
 gtk_window_get_focus

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 90153ad5bf80d97655c054d7bfdef11e4babc29a..18470399998100ec8ccd0bd08742546c0f38d6e2 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -3710,7 +3710,7 @@ gtk_window_set_default_icon (GdkPixbuf *icon)
 /**
  * gtk_window_set_default_icon_name:
  * @name: the name of the themed icon
- * 
+ *
  * Sets an icon to be used as fallback for windows that haven't
  * had gtk_window_set_icon_list() called on them from a named
  * themed icon, see gtk_window_set_icon_name().
@@ -3757,6 +3757,25 @@ gtk_window_set_default_icon_name (const gchar *name)
   g_list_free (toplevels);
 }
 
+/**
+ * gtk_window_get_default_icon_name:
+ *
+ * Returns the fallback icon name for windows that has been set
+ * with gtk_window_set_default_icon_name(). The returned
+ * string is owned by GTK+ and should not be modified. It
+ * is only valid until the next call to
+ * gtk_window_set_default_icon_name().
+ *
+ * Returns: the fallback icon name for windows
+ *
+ * Since: 2.16
+ */
+const gchar *
+gtk_window_get_default_icon_name (void)
+{
+  return default_icon_name;
+}
+
 /**
  * gtk_window_set_default_icon_from_file:
  * @filename: location of icon file

diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h
index 243dbdc6bd8af8e2e9dd81f241d7f182fd2adabe..69189714fd1b4a43d8978fdd1f7b04ea69beb9c4 100644 (file)
--- a/gtk/gtkwindow.h
+++ b/gtk/gtkwindow.h
@@ -292,6 +292,8 @@ void       gtk_window_set_default_icon_list        (GList      *list);
 GList*     gtk_window_get_default_icon_list        (void);
 void       gtk_window_set_default_icon             (GdkPixbuf  *icon);
 void       gtk_window_set_default_icon_name        (const gchar *name);
+G_CONST_RETURN
+gchar     *gtk_window_get_default_icon_name        (void);
 gboolean   gtk_window_set_default_icon_from_file   (const gchar *filename,
                                                    GError     **err);