File Gtk-2_22-compliance.patch of Package gnome-control-center-netbook

Overview Repositories Revisions Requests Users Attributes Meta

File Gtk-2_22-compliance.patch of Package gnome-control-center-netbook (Revision d2c82f675fc87fe51d8d6955cfe39a0c)

Currently displaying revision d2c82f675fc87fe51d8d6955cfe39a0c , Show latest

Index: gnome-control-center-2.32.0/capplets/common/theme-thumbnail.c
===================================================================
--- gnome-control-center-2.32.0.orig/capplets/common/theme-thumbnail.c
+++ gnome-control-center-2.32.0/capplets/common/theme-thumbnail.c
@@ -125,7 +125,7 @@ draw_window_on_pixbuf (GtkWidget *widget
   gtk_window_get_size (GTK_WINDOW (widget), &width, &height);
 
   visual = gtk_widget_get_visual (widget);
-  pixmap = gdk_pixmap_new (NULL, width, height, visual->depth);
+  pixmap = gdk_pixmap_new (NULL, width, height, gdk_visual_get_depth (visual));
   gdk_drawable_set_colormap (GDK_DRAWABLE (pixmap), gtk_widget_get_colormap (widget));
 
   window = gtk_widget_get_window (widget);
Index: gnome-control-center-2.32.0/capplets/common/cc-theme-thumbnailer-slave.c
===================================================================
--- gnome-control-center-2.32.0.orig/capplets/common/cc-theme-thumbnailer-slave.c
+++ gnome-control-center-2.32.0/capplets/common/cc-theme-thumbnailer-slave.c
@@ -169,25 +169,28 @@ fake_expose_widget (GtkWidget    *widget
 {
         GdkWindow     *tmp_window;
         GdkEventExpose event;
+	GtkAllocation  allocation;
 
+	gtk_widget_get_allocation (widget, &allocation);
         event.type = GDK_EXPOSE;
         event.window = pixmap;
         event.send_event = FALSE;
-        event.area = area ? *area : widget->allocation;
+        event.area = area ? *area : allocation;
         event.region = NULL;
         event.count = 0;
 
-        tmp_window = widget->window;
-        widget->window = pixmap;
+        tmp_window = gtk_widget_get_window (widget);
+        //widget->window = pixmap;	//TODO: kill
+	gtk_widget_set_window (widget, pixmap);
         gtk_widget_send_expose (widget, (GdkEvent *) &event);
-        widget->window = tmp_window;
+	gtk_widget_set_window (widget, tmp_window);
 }
 
 static void
 hbox_foreach (GtkWidget *widget,
               gpointer   data)
 {
-        if (GTK_WIDGET_VISIBLE (widget)) {
+        if (gtk_widget_get_visible (widget)) {
                 gtk_widget_realize (widget);
                 gtk_widget_map (widget);
                 gtk_widget_ensure_style (widget);
@@ -288,7 +291,7 @@ create_meta_theme_pixbuf (CcThemeThumbna
         GtkWidget *radio;
 
         GtkRequisition requisition;
-        GtkAllocation  allocation;
+	GtkAllocation  allocation, vbox_allocation;
         GdkPixmap     *pixmap;
         GdkVisual     *visual;
         MetaFrameFlags flags;
@@ -346,11 +349,11 @@ create_meta_theme_pixbuf (CcThemeThumbna
 
         gtk_widget_show_all (preview);
         gtk_widget_realize (stock_button);
-        gtk_widget_realize (GTK_BIN (stock_button)->child);
+        gtk_widget_realize (gtk_bin_get_child (GTK_BIN (stock_button)));
         gtk_widget_realize (checkbox);
         gtk_widget_realize (radio);
         gtk_widget_map (stock_button);
-        gtk_widget_map (GTK_BIN (stock_button)->child);
+        gtk_widget_map (gtk_bin_get_child (GTK_BIN (stock_button)));
         gtk_widget_map (checkbox);
         gtk_widget_map (radio);
 
@@ -370,24 +373,25 @@ create_meta_theme_pixbuf (CcThemeThumbna
 
         /* Create a pixmap */
         visual = gtk_widget_get_visual (window);
-        pixmap = gdk_pixmap_new (NULL, META_THUMBNAIL_SIZE, META_THUMBNAIL_SIZE, visual->depth);
+        pixmap = gdk_pixmap_new (NULL, META_THUMBNAIL_SIZE, META_THUMBNAIL_SIZE, gdk_visual_get_depth (visual));
         gdk_drawable_set_colormap (GDK_DRAWABLE (pixmap), gtk_widget_get_colormap (window));
 
         /* Draw the window */
         gtk_widget_ensure_style (window);
-        g_assert (window->style);
-        g_assert (window->style->font_desc);
+        g_assert (gtk_widget_get_style (window));
+        g_assert (gtk_widget_get_style (window)->font_desc);
 
         fake_expose_widget (window, pixmap, NULL);
         fake_expose_widget (preview, pixmap, NULL);
         /* we call this again here because the preview sometimes draws into the area
          * of the contents, see http://bugzilla.gnome.org/show_bug.cgi?id=351389 */
-        fake_expose_widget (window, pixmap, &vbox->allocation);
+	gtk_widget_get_allocation (vbox, &vbox_allocation);
+        fake_expose_widget (window, pixmap, &vbox_allocation);
         fake_expose_widget (stock_button, pixmap, NULL);
-        gtk_container_foreach (GTK_CONTAINER (GTK_BIN (GTK_BIN (stock_button)->child)->child),
+        gtk_container_foreach (GTK_CONTAINER (gtk_bin_get_child (GTK_BIN (gtk_bin_get_child (GTK_BIN (stock_button))))),
                                hbox_foreach,
                                pixmap);
-        fake_expose_widget (GTK_BIN (stock_button)->child, pixmap, NULL);
+        fake_expose_widget (gtk_bin_get_child (GTK_BIN (stock_button)), pixmap, NULL);
         fake_expose_widget (checkbox, pixmap, NULL);
         fake_expose_widget (radio, pixmap, NULL);
 
@@ -396,11 +400,11 @@ create_meta_theme_pixbuf (CcThemeThumbna
 
         /* Add the icon theme to the pixbuf */
         gdk_pixbuf_composite (icon, pixbuf,
-                              vbox->allocation.x + vbox->allocation.width - icon_width - 5,
-                              vbox->allocation.y + vbox->allocation.height - icon_height - 5,
+                              vbox_allocation.x + vbox_allocation.width - icon_width - 5,
+                              vbox_allocation.y + vbox_allocation.height - icon_height - 5,
                               icon_width, icon_height,
-                              vbox->allocation.x + vbox->allocation.width - icon_width - 5,
-                              vbox->allocation.y + vbox->allocation.height - icon_height - 5,
+                              vbox_allocation.x + vbox_allocation.width - icon_width - 5,
+                              vbox_allocation.y + vbox_allocation.height - icon_height - 5,
                               1.0, 1.0, GDK_INTERP_BILINEAR, 255);
         region = meta_preview_get_clip_region (META_PREVIEW (preview),
                                                META_THUMBNAIL_SIZE, META_THUMBNAIL_SIZE);
@@ -449,11 +453,11 @@ create_gtk_theme_pixbuf (CcThemeThumbnai
 
         gtk_widget_show_all (vbox);
         gtk_widget_realize (stock_button);
-        gtk_widget_realize (GTK_BIN (stock_button)->child);
+        gtk_widget_realize (gtk_bin_get_child (GTK_BIN (stock_button)));
         gtk_widget_realize (checkbox);
         gtk_widget_realize (radio);
         gtk_widget_map (stock_button);
-        gtk_widget_map (GTK_BIN (stock_button)->child);
+        gtk_widget_map (gtk_bin_get_child (GTK_BIN (stock_button)));
         gtk_widget_map (checkbox);
         gtk_widget_map (radio);
 
@@ -467,21 +471,21 @@ create_gtk_theme_pixbuf (CcThemeThumbnai
 
         /* Draw the window */
         gtk_widget_ensure_style (window);
-        g_assert (window->style);
-        g_assert (window->style->font_desc);
+        g_assert (gtk_widget_get_style (window));
+        g_assert (gtk_widget_get_style (window)->font_desc);
 
         gtk_window_get_size (GTK_WINDOW (window), &width, &height);
 
         visual = gtk_widget_get_visual (window);
-        pixmap = gdk_pixmap_new (NULL, width, height, visual->depth);
+        pixmap = gdk_pixmap_new (NULL, width, height, gdk_visual_get_depth (visual));
         gdk_drawable_set_colormap (GDK_DRAWABLE (pixmap), gtk_widget_get_colormap (window));
 
         fake_expose_widget (window, pixmap, NULL);
         fake_expose_widget (stock_button, pixmap, NULL);
-        gtk_container_foreach (GTK_CONTAINER (GTK_BIN (GTK_BIN (stock_button)->child)->child),
+        gtk_container_foreach (GTK_CONTAINER (gtk_bin_get_child (GTK_BIN (gtk_bin_get_child (GTK_BIN (stock_button))))),
                                hbox_foreach,
                                pixmap);
-        fake_expose_widget (GTK_BIN (stock_button)->child, pixmap, NULL);
+        fake_expose_widget (gtk_bin_get_child (GTK_BIN (stock_button)), pixmap, NULL);
         fake_expose_widget (checkbox, pixmap, NULL);
         fake_expose_widget (radio, pixmap, NULL);
 
@@ -505,7 +509,7 @@ create_metacity_theme_pixbuf (CcThemeThu
         MetaFrameFlags flags;
         MetaTheme     *theme;
         GtkRequisition requisition;
-        GtkAllocation  allocation;
+        GtkAllocation  allocation, dummy_allocation;
         GdkVisual     *visual;
         GdkPixmap     *pixmap;
         GdkPixbuf     *pixbuf, *retval;
@@ -555,20 +559,20 @@ create_metacity_theme_pixbuf (CcThemeThu
 
         /* Draw the window */
         gtk_widget_ensure_style (window);
-        g_assert (window->style);
-        g_assert (window->style->font_desc);
+        g_assert (gtk_widget_get_style (window));
+        g_assert (gtk_widget_get_style (window)->font_desc);
 
         /* Create a pixmap */
         visual = gtk_widget_get_visual (window);
         pixmap = gdk_pixmap_new (NULL,
                                  (int) METACITY_THUMBNAIL_WIDTH * 1.2,
                                  (int) METACITY_THUMBNAIL_HEIGHT * 1.2,
-                                 visual->depth);
+                                 gdk_visual_get_depth (visual));
         gdk_drawable_set_colormap (GDK_DRAWABLE (pixmap), gtk_widget_get_colormap (window));
 
         fake_expose_widget (window, pixmap, NULL);
         fake_expose_widget (preview, pixmap, NULL);
-        fake_expose_widget (window, pixmap, &dummy->allocation);
+        fake_expose_widget (window, pixmap, &dummy_allocation);
 
         pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
                                  TRUE,
Index: gnome-control-center-2.32.0/capplets/about-me/gnome-about-me-password.c
===================================================================
--- gnome-control-center-2.32.0.orig/capplets/about-me/gnome-about-me-password.c
+++ gnome-control-center-2.32.0/capplets/about-me/gnome-about-me-password.c
@@ -27,6 +27,8 @@
 #  include <config.h>
 #endif
 
+#include <glib/gi18n-lib.h>
+
 /* Are all of these needed? */
 #include <gdk/gdkkeysyms.h>
 #include <pwd.h>
Index: gnome-control-center-2.32.0/capplets/about-me/gnome-about-me.c
===================================================================
--- gnome-control-center-2.32.0.orig/capplets/about-me/gnome-about-me.c
+++ gnome-control-center-2.32.0/capplets/about-me/gnome-about-me.c
@@ -24,6 +24,7 @@
 #endif
 
 #include <glib/gstdio.h>
+#include <glib/gi18n-lib.h>
 #include <gio/gio.h>
 #include <gconf/gconf-client.h>
 #include <unistd.h>

Places

File Gtk-2_22-compliance.patch of Package gnome-control-center-netbook (Revision d2c82f675fc87fe51d8d6955cfe39a0c)

Places