Removed unused function.

2001-09-07  Alex Larsson  <alexl@redhat.com>

	* gdk/linux-fb/gdkcolor-fb.c:
	Removed unused function.

	* gdk/linux-fb/gdkdrawable-fb2.c
	* gdk/linux-fb/gdkfont-fb.c:
	Use PangoLanguage functions.

	* gdk/linux-fb/gdkinput.c:
	* gdk/linux-fb/gdkselection-fb.c:
	Fix const warnings.

	* gdk/linux-fb/gdkwindow-fb.c:
	Fix warning. Implement gdk_window_set_icon_list() and
	gdk_window_get_frame_extents(). (No icon support yet though.)

	* gtk/gtkwindow.c (gtk_window_get_position):
	If window->frame is set get the extents of it instead.

diff --git a/ChangeLog b/ChangeLog
index d1d8d35a1d97b69ef4c717ff00506efff8bb38f7..d366c7711b91a079199a5e081c9bac6fa8cfe1b2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2001-09-07  Alex Larsson  <alexl@redhat.com>
+
+       * gdk/linux-fb/gdkcolor-fb.c:
+       Removed unused function.
+       
+       * gdk/linux-fb/gdkdrawable-fb2.c
+       * gdk/linux-fb/gdkfont-fb.c:
+       Use PangoLanguage functions.
+
+       * gdk/linux-fb/gdkinput.c:
+       * gdk/linux-fb/gdkselection-fb.c:
+       Fix const warnings.
+       
+       * gdk/linux-fb/gdkwindow-fb.c:
+       Fix warning. Implement gdk_window_set_icon_list() and
+       gdk_window_get_frame_extents(). (No icon support yet though.)
+
+       * gtk/gtkwindow.c (gtk_window_get_position):
+       If window->frame is set get the extents of it instead.
+       
 Fri Sep  7 18:50:59 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwidget.c (gtk_widget_get_default_colormap): 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index d1d8d35a1d97b69ef4c717ff00506efff8bb38f7..d366c7711b91a079199a5e081c9bac6fa8cfe1b2 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,23 @@
+2001-09-07  Alex Larsson  <alexl@redhat.com>
+
+       * gdk/linux-fb/gdkcolor-fb.c:
+       Removed unused function.
+       
+       * gdk/linux-fb/gdkdrawable-fb2.c
+       * gdk/linux-fb/gdkfont-fb.c:
+       Use PangoLanguage functions.
+
+       * gdk/linux-fb/gdkinput.c:
+       * gdk/linux-fb/gdkselection-fb.c:
+       Fix const warnings.
+       
+       * gdk/linux-fb/gdkwindow-fb.c:
+       Fix warning. Implement gdk_window_set_icon_list() and
+       gdk_window_get_frame_extents(). (No icon support yet though.)
+
+       * gtk/gtkwindow.c (gtk_window_get_position):
+       If window->frame is set get the extents of it instead.
+       
 Fri Sep  7 18:50:59 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwidget.c (gtk_widget_get_default_colormap): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d1d8d35a1d97b69ef4c717ff00506efff8bb38f7..d366c7711b91a079199a5e081c9bac6fa8cfe1b2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,23 @@
+2001-09-07  Alex Larsson  <alexl@redhat.com>
+
+       * gdk/linux-fb/gdkcolor-fb.c:
+       Removed unused function.
+       
+       * gdk/linux-fb/gdkdrawable-fb2.c
+       * gdk/linux-fb/gdkfont-fb.c:
+       Use PangoLanguage functions.
+
+       * gdk/linux-fb/gdkinput.c:
+       * gdk/linux-fb/gdkselection-fb.c:
+       Fix const warnings.
+       
+       * gdk/linux-fb/gdkwindow-fb.c:
+       Fix warning. Implement gdk_window_set_icon_list() and
+       gdk_window_get_frame_extents(). (No icon support yet though.)
+
+       * gtk/gtkwindow.c (gtk_window_get_position):
+       If window->frame is set get the extents of it instead.
+       
 Fri Sep  7 18:50:59 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwidget.c (gtk_widget_get_default_colormap): 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index d1d8d35a1d97b69ef4c717ff00506efff8bb38f7..d366c7711b91a079199a5e081c9bac6fa8cfe1b2 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,23 @@
+2001-09-07  Alex Larsson  <alexl@redhat.com>
+
+       * gdk/linux-fb/gdkcolor-fb.c:
+       Removed unused function.
+       
+       * gdk/linux-fb/gdkdrawable-fb2.c
+       * gdk/linux-fb/gdkfont-fb.c:
+       Use PangoLanguage functions.
+
+       * gdk/linux-fb/gdkinput.c:
+       * gdk/linux-fb/gdkselection-fb.c:
+       Fix const warnings.
+       
+       * gdk/linux-fb/gdkwindow-fb.c:
+       Fix warning. Implement gdk_window_set_icon_list() and
+       gdk_window_get_frame_extents(). (No icon support yet though.)
+
+       * gtk/gtkwindow.c (gtk_window_get_position):
+       If window->frame is set get the extents of it instead.
+       
 Fri Sep  7 18:50:59 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwidget.c (gtk_widget_get_default_colormap): 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d1d8d35a1d97b69ef4c717ff00506efff8bb38f7..d366c7711b91a079199a5e081c9bac6fa8cfe1b2 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,23 @@
+2001-09-07  Alex Larsson  <alexl@redhat.com>
+
+       * gdk/linux-fb/gdkcolor-fb.c:
+       Removed unused function.
+       
+       * gdk/linux-fb/gdkdrawable-fb2.c
+       * gdk/linux-fb/gdkfont-fb.c:
+       Use PangoLanguage functions.
+
+       * gdk/linux-fb/gdkinput.c:
+       * gdk/linux-fb/gdkselection-fb.c:
+       Fix const warnings.
+       
+       * gdk/linux-fb/gdkwindow-fb.c:
+       Fix warning. Implement gdk_window_set_icon_list() and
+       gdk_window_get_frame_extents(). (No icon support yet though.)
+
+       * gtk/gtkwindow.c (gtk_window_get_position):
+       If window->frame is set get the extents of it instead.
+       
 Fri Sep  7 18:50:59 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwidget.c (gtk_widget_get_default_colormap): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d1d8d35a1d97b69ef4c717ff00506efff8bb38f7..d366c7711b91a079199a5e081c9bac6fa8cfe1b2 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,23 @@
+2001-09-07  Alex Larsson  <alexl@redhat.com>
+
+       * gdk/linux-fb/gdkcolor-fb.c:
+       Removed unused function.
+       
+       * gdk/linux-fb/gdkdrawable-fb2.c
+       * gdk/linux-fb/gdkfont-fb.c:
+       Use PangoLanguage functions.
+
+       * gdk/linux-fb/gdkinput.c:
+       * gdk/linux-fb/gdkselection-fb.c:
+       Fix const warnings.
+       
+       * gdk/linux-fb/gdkwindow-fb.c:
+       Fix warning. Implement gdk_window_set_icon_list() and
+       gdk_window_get_frame_extents(). (No icon support yet though.)
+
+       * gtk/gtkwindow.c (gtk_window_get_position):
+       If window->frame is set get the extents of it instead.
+       
 Fri Sep  7 18:50:59 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwidget.c (gtk_widget_get_default_colormap): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d1d8d35a1d97b69ef4c717ff00506efff8bb38f7..d366c7711b91a079199a5e081c9bac6fa8cfe1b2 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,23 @@
+2001-09-07  Alex Larsson  <alexl@redhat.com>
+
+       * gdk/linux-fb/gdkcolor-fb.c:
+       Removed unused function.
+       
+       * gdk/linux-fb/gdkdrawable-fb2.c
+       * gdk/linux-fb/gdkfont-fb.c:
+       Use PangoLanguage functions.
+
+       * gdk/linux-fb/gdkinput.c:
+       * gdk/linux-fb/gdkselection-fb.c:
+       Fix const warnings.
+       
+       * gdk/linux-fb/gdkwindow-fb.c:
+       Fix warning. Implement gdk_window_set_icon_list() and
+       gdk_window_get_frame_extents(). (No icon support yet though.)
+
+       * gtk/gtkwindow.c (gtk_window_get_position):
+       If window->frame is set get the extents of it instead.
+       
 Fri Sep  7 18:50:59 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwidget.c (gtk_widget_get_default_colormap): 

diff --git a/gdk/linux-fb/gdkcolor-fb.c b/gdk/linux-fb/gdkcolor-fb.c
index e720058ca6e6ec8026d45fea3e7886a380b67c67..57428bfea87585c3810c8ea8ab82390aede02454 100644 (file)
--- a/gdk/linux-fb/gdkcolor-fb.c
+++ b/gdk/linux-fb/gdkcolor-fb.c
@@ -201,15 +201,6 @@ gdk_colormap_new (GdkVisual *visual,
   return colormap;
 }
 
-#define MIN_SYNC_TIME 2
-
-static void
-gdk_colormap_sync (GdkColormap *colormap,
-                  gboolean     force)
-{
-  
-}                 
-
 GdkColormap*
 gdk_colormap_get_system (void)
 {

diff --git a/gdk/linux-fb/gdkdrawable-fb2.c b/gdk/linux-fb/gdkdrawable-fb2.c
index 0fa7cc83465642d2ea224479d0fbc0424290c64c..fcca45bf0f65e9d66815a3096f462d61d8fe01a0 100644 (file)
--- a/gdk/linux-fb/gdkdrawable-fb2.c
+++ b/gdk/linux-fb/gdkdrawable-fb2.c
@@ -866,7 +866,7 @@ gdk_fb_draw_text(GdkDrawable    *drawable,
     {
       gunichar wc = g_utf8_get_char (p);
       p = g_utf8_next_char (p);
-      shaper = pango_font_find_shaper (private->pango_font, "fr", wc);
+      shaper = pango_font_find_shaper (private->pango_font, pango_language_from_string ("fr"), wc);
       if (shaper != last_shaper)
        {
          analysis.shape_engine = shaper;

diff --git a/gdk/linux-fb/gdkfont-fb.c b/gdk/linux-fb/gdkfont-fb.c
index ebd4bec06cafd7a8d505b2f5b8f023b0265965c9..4d18b3c8a3a60844de3f008ee86a0d38506591eb 100644 (file)
--- a/gdk/linux-fb/gdkfont-fb.c
+++ b/gdk/linux-fb/gdkfont-fb.c
@@ -345,7 +345,7 @@ gdk_text_extents (GdkFont     *font,
     {
       gunichar wc = g_utf8_get_char (p);
       p = g_utf8_next_char (p);
-      shaper = pango_font_find_shaper (private->pango_font, "fr", wc);
+      shaper = pango_font_find_shaper (private->pango_font, pango_language_from_string ("fr"), wc);
       if (shaper != last_shaper)
        {
          analysis.shape_engine = shaper;

diff --git a/gdk/linux-fb/gdkinput.c b/gdk/linux-fb/gdkinput.c
index d8015430ab4bbf9b75e5c778f28defc0507fb7fd..48053ddbb1f34049c9df743ef235c7904fe52eaf 100644 (file)
--- a/gdk/linux-fb/gdkinput.c
+++ b/gdk/linux-fb/gdkinput.c
@@ -32,7 +32,7 @@
 #include "gdkprivate.h"
 #include "gdkinputprivate.h"
 
-static const GdkDeviceAxis gdk_input_core_axes[] = {
+static GdkDeviceAxis gdk_input_core_axes[] = {
   { GDK_AXIS_X, 0, 0 },
   { GDK_AXIS_Y, 0, 0 }
 };

diff --git a/gdk/linux-fb/gdkkeyboard-fb.c b/gdk/linux-fb/gdkkeyboard-fb.c
index 2aebfff7676d1201c025ad48772966673beb98dd..1f7d75dcbd9de9a9fed7091c76d9a2bb8e7c07f8 100644 (file)
--- a/gdk/linux-fb/gdkkeyboard-fb.c
+++ b/gdk/linux-fb/gdkkeyboard-fb.c
@@ -22,6 +22,7 @@
 #include "gdkkeysyms.h"
 #include "gdkprivate-fb.h"
 #include <stdlib.h>
+#include <unistd.h>
 #include <string.h>
 #include <ctype.h>
 #include <termios.h>

diff --git a/gdk/linux-fb/gdkselection-fb.c b/gdk/linux-fb/gdkselection-fb.c
index 22956c788b74856516ca1b153e61b2f2b9a3f012..8a4b253ddf994ab1fc364770c0e2f160f87c0a57 100644 (file)
--- a/gdk/linux-fb/gdkselection-fb.c
+++ b/gdk/linux-fb/gdkselection-fb.c
@@ -407,7 +407,7 @@ gdk_text_property_to_utf8_list (GdkAtom        encoding,
       gchar **local_list;
       gint local_count;
       gint i;
-      gchar *charset = NULL;
+      const gchar *charset = NULL;
       gboolean need_conversion = !g_get_charset (&charset);
       gint count = 0;
       GError *error = NULL;

diff --git a/gdk/linux-fb/gdkwindow-fb.c b/gdk/linux-fb/gdkwindow-fb.c
index 3557bee26c2532dd5bca5a24a422176729e585f4..a5a997d7ee21c4f16e1ce231bc7781fef601ef22 100644 (file)
--- a/gdk/linux-fb/gdkwindow-fb.c
+++ b/gdk/linux-fb/gdkwindow-fb.c
@@ -2175,8 +2175,6 @@ void
 gdk_window_set_type_hint (GdkWindow        *window,
                          GdkWindowTypeHint hint)
 {
-  GdkAtom atom;
-  
   g_return_if_fail (window != NULL);
   g_return_if_fail (GDK_IS_WINDOW (window));
 }
@@ -2209,3 +2207,25 @@ gdk_window_begin_move_drag (GdkWindow *window,
 {
   g_return_if_fail (GDK_IS_WINDOW (window));
 }
+
+void
+gdk_window_set_icon_list (GdkWindow *window,
+                         GList     *pixbufs)
+{
+  /* We don't support icons right now */
+}
+
+/* No need to care about frames. Decoration is done by GtkWindow */
+void
+gdk_window_get_frame_extents (GdkWindow    *window,
+                              GdkRectangle *rect)
+{
+  g_return_val_if_fail (window != NULL, 0);
+  
+  rect->x = GDK_DRAWABLE_IMPL_FBDATA (window)->abs_x;
+  rect->y = GDK_DRAWABLE_IMPL_FBDATA (window)->abs_y;
+  rect->width = GDK_DRAWABLE_IMPL_FBDATA (window)->width;
+  rect->height = GDK_DRAWABLE_IMPL_FBDATA (window)->height;
+
+  return TRUE;
+}

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 86ba6c46a9e743734cad62b6f7cc1a62b37c178a..0b51d273bd908a4a4c0bb83b9b033f00cf4aada4 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -2650,7 +2650,10 @@ gtk_window_get_position (GtkWindow *window,
       
       if (GTK_WIDGET_MAPPED (widget))
         {
-          gdk_window_get_frame_extents (widget->window, &frame_extents);
+         if (window->frame)
+           gdk_window_get_frame_extents (window->frame, &frame_extents);
+         else
+           gdk_window_get_frame_extents (widget->window, &frame_extents);
           x = frame_extents.x;
           y = frame_extents.y;
           gtk_window_get_size (window, &w, &h);