[Emacs-diffs] /srv/bzr/emacs/trunk r109857: Prototype for x_wm_set_size_hint restored.

[Jan D.]

------------------------------------------------------------
revno: 109857
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sun 2012-09-02 12:53:46 +0200
message:
  Prototype for x_wm_set_size_hint restored.
  
  * frame.h: Add missing prototype for x_wm_set_size_hint.
  
  * gtkutil.h: Remove prototype for x_wm_set_size_hint.
modified:
  src/ChangeLog
  src/frame.h
  src/gtkutil.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-09-02 07:10:10 +0000
+++ b/src/ChangeLog     2012-09-02 10:53:46 +0000
@@ -1,3 +1,9 @@
+2012-09-02  Jan Djärv  <address@hidden>
+
+       * gtkutil.h: Remove prototype for x_wm_set_size_hint.
+
+       * frame.h: Add missing prototype for x_wm_set_size_hint.
+
 2012-09-02  Paul Eggert  <address@hidden>
 
        * doc.c, editfns.c, insdel.c, intervals.c: Use bool for boolean.

=== modified file 'src/frame.h'
--- a/src/frame.h       2012-09-01 06:38:52 +0000
+++ b/src/frame.h       2012-09-02 10:53:46 +0000
@@ -1206,6 +1206,7 @@
 extern void x_set_scroll_bar_default_width (struct frame *);
 extern void x_set_offset (struct frame *, int, int, int);
 extern void x_wm_set_icon_position (struct frame *, int, int);
+extern void x_wm_set_size_hint (FRAME_PTR f, long flags, int user_position);
 
 extern Lisp_Object x_new_font (struct frame *, Lisp_Object, int);
 

=== modified file 'src/gtkutil.h'
--- a/src/gtkutil.h     2012-09-01 06:38:52 +0000
+++ b/src/gtkutil.h     2012-09-02 10:53:46 +0000
@@ -150,9 +150,6 @@
 
 extern int xg_create_frame_widgets (FRAME_PTR f);
 extern void xg_free_frame_widgets (FRAME_PTR f);
-extern void x_wm_set_size_hint (FRAME_PTR f,
-                                long flags,
-                                int user_position);
 extern void xg_set_background_color (FRAME_PTR f, unsigned long bg);
 extern int xg_check_special_colors (struct frame *f,
                                     const char *color_name,