Merge lp:~kalikiana/midori/kcbtwarn into lp:midori

[Cris Dywan]

Fix warnings in KatzeCellRendererComboboxText

[André Stösel (ivaldi)]

Looks good!

review: Approve

=== modified file 'katze/katze-cellrenderercomboboxtext.c'
--- katze/katze-cellrenderercomboboxtext.c	2013-07-27 21:41:11 +0000
+++ katze/katze-cellrenderercomboboxtext.c	2013-08-02 18:05:30 +0000
@@ -39,7 +39,7 @@
 static void
 katze_cell_renderer_combobox_text_get_size (GtkCellRenderer* cell,
     GtkWidget*       widget,
-    GdkRectangle*    cell_area,
+    const GdkRectangle*                                      cell_area,
     gint*            x_offset,
     gint*            y_offset,
     gint*            width,
@@ -49,8 +49,8 @@
 katze_cell_renderer_combobox_text_render (GtkCellRenderer      *cell,
     cairo_t*             cr,
     GtkWidget            *widget,
-    GdkRectangle         *background_area,
-    GdkRectangle         *cell_area,
+    const GdkRectangle   *background_area,
+    const GdkRectangle   *cell_area,
     GtkCellRendererState  flags);
 #else
 static void
@@ -142,9 +142,6 @@
 
     object_class->finalize = katze_cell_renderer_combobox_text_finalize;
 
-    _cell_renderer_get_size = cell_class->get_size;
-    _cell_renderer_render = cell_class->render;
-
     object_class->get_property = katze_cell_renderer_combobox_text_get_property;
     object_class->set_property = katze_cell_renderer_combobox_text_set_property;
 
@@ -452,7 +449,7 @@
 static void
 katze_cell_renderer_combobox_text_get_size (GtkCellRenderer *cell,
 				 GtkWidget       *widget,
-				 GdkRectangle    *cell_area,
+				 const GdkRectangle         *cell_area,
 				 gint            *x_offset,
 				 gint            *y_offset,
 				 gint            *width,
@@ -464,7 +461,7 @@
 
     set_text (KATZE_CELL_RENDERER_COMBOBOX_TEXT (cell), widget, text);
 
-    _cell_renderer_get_size (cell,
+    GTK_CELL_RENDERER_CLASS (katze_cell_renderer_combobox_text_parent_class)->get_size (cell,
         widget, cell_area,
         x_offset, y_offset, width, height);
 
@@ -477,8 +474,8 @@
 katze_cell_renderer_combobox_text_render (GtkCellRenderer      *cell,
 			       cairo_t*             cr,
 			       GtkWidget            *widget,
-			       GdkRectangle         *background_area,
-			       GdkRectangle         *cell_area,
+			       const GdkRectangle   *background_area,
+			       const GdkRectangle   *cell_area,
 			       GtkCellRendererState  flags)
 #else
 katze_cell_renderer_combobox_text_render (GtkCellRenderer      *cell,
@@ -497,14 +494,14 @@
     set_text (KATZE_CELL_RENDERER_COMBOBOX_TEXT (cell), widget, text);
 
 #if GTK_CHECK_VERSION(3,0,0)
-    _cell_renderer_render (cell,
+    GTK_CELL_RENDERER_CLASS (katze_cell_renderer_combobox_text_parent_class)->render (cell,
         cr,
         widget,
         background_area,
         cell_area,
         flags);
 #else
-    _cell_renderer_render (cell,
+    GTK_CELL_RENDERER_CLASS (katze_cell_renderer_combobox_text_parent_class)->render (cell,
         window,
         widget,
         background_area,