Midori Web Browser

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

  1. kcbtwarn
  2. Merge into trunk
Proposed by Cris Dywan
Status: Merged
Approved by: André Stösel
Approved revision: 6307
Merged at revision: 6312
Proposed branch: lp:~kalikiana/midori/kcbtwarn
Merge into: lp:midori
Diff against target: 79 lines (+9/-12)
1 file modified
katze/katze-cellrenderercomboboxtext.c (+9/-12)
To merge this branch: bzr merge lp:~kalikiana/midori/kcbtwarn
Reviewer Review Type Date Requested Status
André Stösel Approve
Review via email: mp+178353@code.launchpad.net

Commit message

Fix warnings in KatzeCellRendererComboboxText

To post a comment you must log in.
Revision history for this message
André Stösel (ivaldi) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'katze/katze-cellrenderercomboboxtext.c'
2--- katze/katze-cellrenderercomboboxtext.c 2013-07-27 21:41:11 +0000
3+++ katze/katze-cellrenderercomboboxtext.c 2013-08-02 18:05:30 +0000
4@@ -39,7 +39,7 @@
5 static void
6 katze_cell_renderer_combobox_text_get_size (GtkCellRenderer* cell,
7 GtkWidget* widget,
8- GdkRectangle* cell_area,
9+ const GdkRectangle* cell_area,
10 gint* x_offset,
11 gint* y_offset,
12 gint* width,
13@@ -49,8 +49,8 @@
14 katze_cell_renderer_combobox_text_render (GtkCellRenderer *cell,
15 cairo_t* cr,
16 GtkWidget *widget,
17- GdkRectangle *background_area,
18- GdkRectangle *cell_area,
19+ const GdkRectangle *background_area,
20+ const GdkRectangle *cell_area,
21 GtkCellRendererState flags);
22 #else
23 static void
24@@ -142,9 +142,6 @@
25
26 object_class->finalize = katze_cell_renderer_combobox_text_finalize;
27
28- _cell_renderer_get_size = cell_class->get_size;
29- _cell_renderer_render = cell_class->render;
30-
31 object_class->get_property = katze_cell_renderer_combobox_text_get_property;
32 object_class->set_property = katze_cell_renderer_combobox_text_set_property;
33
34@@ -452,7 +449,7 @@
35 static void
36 katze_cell_renderer_combobox_text_get_size (GtkCellRenderer *cell,
37 GtkWidget *widget,
38- GdkRectangle *cell_area,
39+ const GdkRectangle *cell_area,
40 gint *x_offset,
41 gint *y_offset,
42 gint *width,
43@@ -464,7 +461,7 @@
44
45 set_text (KATZE_CELL_RENDERER_COMBOBOX_TEXT (cell), widget, text);
46
47- _cell_renderer_get_size (cell,
48+ GTK_CELL_RENDERER_CLASS (katze_cell_renderer_combobox_text_parent_class)->get_size (cell,
49 widget, cell_area,
50 x_offset, y_offset, width, height);
51
52@@ -477,8 +474,8 @@
53 katze_cell_renderer_combobox_text_render (GtkCellRenderer *cell,
54 cairo_t* cr,
55 GtkWidget *widget,
56- GdkRectangle *background_area,
57- GdkRectangle *cell_area,
58+ const GdkRectangle *background_area,
59+ const GdkRectangle *cell_area,
60 GtkCellRendererState flags)
61 #else
62 katze_cell_renderer_combobox_text_render (GtkCellRenderer *cell,
63@@ -497,14 +494,14 @@
64 set_text (KATZE_CELL_RENDERER_COMBOBOX_TEXT (cell), widget, text);
65
66 #if GTK_CHECK_VERSION(3,0,0)
67- _cell_renderer_render (cell,
68+ GTK_CELL_RENDERER_CLASS (katze_cell_renderer_combobox_text_parent_class)->render (cell,
69 cr,
70 widget,
71 background_area,
72 cell_area,
73 flags);
74 #else
75- _cell_renderer_render (cell,
76+ GTK_CELL_RENDERER_CLASS (katze_cell_renderer_combobox_text_parent_class)->render (cell,
77 window,
78 widget,
79 background_area,

Subscribers

People subscribed via source and target branches

to all changes: