Midori Web Browser

Merge lp:~gue5t/midori/gtkdialog-deprecation into lp:midori

  1. gtkdialog-deprecation
  2. Merge into trunk
Proposed by gue5t gue5t
Status: Merged
Approved by: Cris Dywan
Approved revision: 6938
Merged at revision: 6943
Proposed branch: lp:~gue5t/midori/gtkdialog-deprecation
Merge into: lp:midori
Diff against target: 12 lines (+1/-1)
1 file modified
katze/katze-preferences.c (+1/-1)
To merge this branch: bzr merge lp:~gue5t/midori/gtkdialog-deprecation
Reviewer Review Type Date Requested Status
Cris Dywan Approve
Review via email: mp+256756@code.launchpad.net

Commit message

avoid deprecated GtkDialog API with GTK+2 >= 2.22

Description of the change

This avoids warnings related to the deprecated "GtkDialog:has-separator" in GTK versions where the property is deprecated, and thereby makes some tests green which were upset by the runtime warning.

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

Nice!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'katze/katze-preferences.c'
2--- katze/katze-preferences.c 2014-05-20 02:15:05 +0000
3+++ katze/katze-preferences.c 2015-04-19 14:48:49 +0000
4@@ -67,7 +67,7 @@
5 g_object_set (preferences,
6 "icon-name", GTK_STOCK_PREFERENCES,
7 "title", dialog_title,
8-#if !GTK_CHECK_VERSION (3, 0, 0)
9+#if !GTK_CHECK_VERSION (2, 22, 0)
10 "has-separator", FALSE,
11 #endif
12 NULL);

Subscribers

People subscribed via source and target branches

to all changes: