Midori Web Browser

Merge lp:~aauzi/midori/fixgtk2warnings into lp:midori

  1. fixgtk2warnings
  2. Merge into trunk
Proposed by André Auzi
Status: Merged
Approved by: Paweł Forysiuk
Approved revision: 6320
Merged at revision: 6325
Proposed branch: lp:~aauzi/midori/fixgtk2warnings
Merge into: lp:midori
Diff against target: 29 lines (+10/-2)
1 file modified
katze/katze-cellrenderercomboboxtext.c (+10/-2)
To merge this branch: bzr merge lp:~aauzi/midori/fixgtk2warnings
Reviewer Review Type Date Requested Status
gue5t gue5t Approve
Review via email: mp+178494@code.launchpad.net

Commit message

Fix katze-cellrenderercomboboxtext gtk-2 warnings

Description of the change

My share of warnings cleanups in katze-cellrenderercomboboxtext

To post a comment you must log in.
Revision history for this message
gue5t gue5t (gue5t) wrote :

I was a little confused because both GTK2 and GTK3 declare the actual function gtk_cell_renderer_get_size with a const GdkRectangle* argument--but the vtable itself does indeed lack const with GTK2. 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-08-02 18:01:42 +0000
3+++ katze/katze-cellrenderercomboboxtext.c 2013-08-05 05:19:35 +0000
4@@ -39,7 +39,11 @@
5 static void
6 katze_cell_renderer_combobox_text_get_size (GtkCellRenderer* cell,
7 GtkWidget* widget,
8- const GdkRectangle* cell_area,
9+#if GTK_CHECK_VERSION(3,0,0)
10+ const GdkRectangle* cell_area,
11+#else
12+ GdkRectangle* cell_area,
13+#endif
14 gint* x_offset,
15 gint* y_offset,
16 gint* width,
17@@ -449,7 +453,11 @@
18 static void
19 katze_cell_renderer_combobox_text_get_size (GtkCellRenderer *cell,
20 GtkWidget *widget,
21- const GdkRectangle *cell_area,
22+#if GTK_CHECK_VERSION(3,0,0)
23+ const GdkRectangle* cell_area,
24+#else
25+ GdkRectangle* cell_area,
26+#endif
27 gint *x_offset,
28 gint *y_offset,
29 gint *width,

Subscribers

People subscribed via source and target branches

to all changes: