x11: Store GDK name in xsettings hash table

[~andy/gtk] / gdk / gdkproperty.h

diff --git a/gdk/gdkproperty.h b/gdk/gdkproperty.h
index 4ea6f8153d40ade5169d503468f8425a9812e8ab..795f1d4971cca5524e39d8a282a8adcdfd07af70 100644 (file)
--- a/gdk/gdkproperty.h
+++ b/gdk/gdkproperty.h
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
@@ -24,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GDK_PROPERTY_H__
+#define __GDK_PROPERTY_H__
+
 #if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#ifndef __GDK_PROPERTY_H__
-#define __GDK_PROPERTY_H__
-
 #include <gdk/gdktypes.h>
 
 G_BEGIN_DECLS
@@ -54,83 +52,39 @@ typedef enum
 
 
 GdkAtom gdk_atom_intern (const gchar *atom_name,
-                        gboolean     only_if_exists);
+                         gboolean     only_if_exists);
 GdkAtom gdk_atom_intern_static_string (const gchar *atom_name);
 gchar*  gdk_atom_name   (GdkAtom      atom);
 
 
 gboolean gdk_property_get    (GdkWindow     *window,
-                             GdkAtom        property,
-                             GdkAtom        type,
-                             gulong         offset,
-                             gulong         length,
-                             gint           pdelete,
-                             GdkAtom       *actual_property_type,
-                             gint          *actual_format,
-                             gint          *actual_length,
-                             guchar       **data);
+                              GdkAtom        property,
+                              GdkAtom        type,
+                              gulong         offset,
+                              gulong         length,
+                              gint           pdelete,
+                              GdkAtom       *actual_property_type,
+                              gint          *actual_format,
+                              gint          *actual_length,
+                              guchar       **data);
 void     gdk_property_change (GdkWindow     *window,
-                             GdkAtom        property,
-                             GdkAtom        type,
-                             gint           format,
-                             GdkPropMode    mode,
-                             const guchar  *data,
-                             gint           nelements);
+                              GdkAtom        property,
+                              GdkAtom        type,
+                              gint           format,
+                              GdkPropMode    mode,
+                              const guchar  *data,
+                              gint           nelements);
 void     gdk_property_delete (GdkWindow     *window,
-                             GdkAtom        property);
-
-#ifndef GDK_MULTIHEAD_SAFE
-gint gdk_text_property_to_text_list (GdkAtom        encoding,
-                                    gint           format,
-                                    const guchar  *text,
-                                    gint           length,
-                                    gchar       ***list);
-gint gdk_text_property_to_utf8_list (GdkAtom        encoding,
-                                    gint           format,
-                                    const guchar  *text,
-                                    gint           length,
-                                    gchar       ***list);
-gboolean gdk_utf8_to_compound_text (const gchar *str,
-                                   GdkAtom     *encoding,
-                                   gint        *format,
-                                   guchar     **ctext,
-                                   gint        *length);
-gint gdk_string_to_compound_text    (const gchar   *str,
-                                    GdkAtom       *encoding,
-                                    gint          *format,
-                                    guchar       **ctext,
-                                    gint          *length);
-#endif /* GDK_MULTIHEAD_SAFE */
+                              GdkAtom        property);
 
-gint gdk_text_property_to_text_list_for_display (GdkDisplay     *display,
-                                                GdkAtom         encoding,
-                                                gint            format,
-                                                const guchar   *text,
-                                                gint            length,
-                                                gchar        ***list);
-gint gdk_text_property_to_utf8_list_for_display (GdkDisplay     *display,
-                                                GdkAtom         encoding,
-                                                gint            format,
-                                                const guchar   *text,
-                                                gint            length,
-                                                gchar        ***list);
-  
-gchar   *gdk_utf8_to_string_target   (const gchar *str);
-gint     gdk_string_to_compound_text_for_display (GdkDisplay   *display,
-                                                 const gchar  *str,
-                                                 GdkAtom      *encoding,
-                                                 gint         *format,
-                                                 guchar      **ctext,
-                                                 gint         *length);
-gboolean gdk_utf8_to_compound_text_for_display   (GdkDisplay   *display,
-                                                 const gchar  *str,
-                                                 GdkAtom      *encoding,
-                                                 gint         *format,
-                                                 guchar      **ctext,
-                                                 gint         *length);
+gint   gdk_text_property_to_utf8_list_for_display (GdkDisplay     *display,
+                                                   GdkAtom         encoding,
+                                                   gint            format,
+                                                   const guchar   *text,
+                                                   gint            length,
+                                                   gchar        ***list);
 
-void gdk_free_text_list             (gchar        **list);
-void gdk_free_compound_text         (guchar        *ctext);
+gchar *gdk_utf8_to_string_target                  (const gchar    *str);
 
 G_END_DECLS