gtk+ r22387 - in trunk: docs/reference docs/reference/gtk gtk

[matthiasc svn gnome org]

Author: matthiasc
Date: Fri Feb 20 05:54:53 2009
New Revision: 22387
URL: http://svn.gnome.org/viewvc/gtk+?rev=22387&view=rev

Log:
Add a function to get the default window icon name


Modified:
   trunk/docs/reference/ChangeLog
   trunk/docs/reference/gtk/gtk-sections.txt
   trunk/gtk/gtk.symbols
   trunk/gtk/gtkwindow.c
   trunk/gtk/gtkwindow.h

Modified: trunk/docs/reference/gtk/gtk-sections.txt
==============================================================================
--- trunk/docs/reference/gtk/gtk-sections.txt	(original)
+++ trunk/docs/reference/gtk/gtk-sections.txt	Fri Feb 20 05:54:53 2009
@@ -5577,6 +5577,7 @@
 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

Modified: trunk/gtk/gtk.symbols
==============================================================================
--- trunk/gtk/gtk.symbols	(original)
+++ trunk/gtk/gtk.symbols	Fri Feb 20 05:54:53 2009
@@ -5038,6 +5038,7 @@
 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

Modified: trunk/gtk/gtkwindow.c
==============================================================================
--- trunk/gtk/gtkwindow.c	(original)
+++ trunk/gtk/gtkwindow.c	Fri Feb 20 05:54:53 2009
@@ -3710,7 +3710,7 @@
 /**
  * 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().
@@ -3758,6 +3758,25 @@
 }
 
 /**
+ * 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
  * @err: location to store error, or %NULL.

Modified: trunk/gtk/gtkwindow.h
==============================================================================
--- trunk/gtk/gtkwindow.h	(original)
+++ trunk/gtk/gtkwindow.h	Fri Feb 20 05:54:53 2009
@@ -292,6 +292,8 @@
 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);