Midori Web Browser

Merge lp:~midori/midori/lessClutter into lp:midori

  1. lessClutter
  2. Merge into trunk
Proposed by Cris Dywan
Status: Merged
Approved by: gue5t gue5t
Approved revision: 6602
Merged at revision: 6605
Proposed branch: lp:~midori/midori/lessClutter
Merge into: lp:midori
Diff against target: 45 lines (+1/-17)
2 files modified
midori/midori-app.c (+1/-4)
midori/midori-view.h (+0/-13)
To merge this branch: bzr merge lp:~midori/midori/lessClutter
Reviewer Review Type Date Requested Status
gue5t gue5t Approve
Review via email: mp+211203@code.launchpad.net

Commit message

Drop forgotten clutter init and obsolete header declarations

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'midori/midori-app.c'
2--- midori/midori-app.c 2014-03-05 18:43:15 +0000
3+++ midori/midori-app.c 2014-03-16 12:13:43 +0000
4@@ -1210,10 +1210,7 @@
5 textdomain (GETTEXT_PACKAGE);
6 #endif
7
8- #ifdef HAVE_GRANITE_CLUTTER
9- success = gtk_clutter_init_with_args (argc, argument_vector, _("[Addresses]"),
10- (GOptionEntry*)entries, GETTEXT_PACKAGE, &error);
11- #elif GTK_CHECK_VERSION (3, 0, 0)
12+ #if GTK_CHECK_VERSION (3, 0, 0)
13 success = gtk_init_with_args (argc, argument_vector, _("[Addresses]"),
14 entries, GETTEXT_PACKAGE, &error);
15 #else
16
17=== modified file 'midori/midori-view.h'
18--- midori/midori-view.h 2013-11-04 16:08:35 +0000
19+++ midori/midori-view.h 2014-03-16 12:13:43 +0000
20@@ -17,10 +17,6 @@
21
22 #include <katze/katze.h>
23
24-#ifdef HAVE_GRANITE
25- #include <granite/granite.h>
26-#endif
27-
28 G_BEGIN_DECLS
29
30 typedef enum
31@@ -128,15 +124,6 @@
32 PangoEllipsizeMode
33 midori_view_get_label_ellipsize (MidoriView* view);
34
35-#ifdef HAVE_GRANITE
36-GraniteWidgetsTab*
37-midori_view_get_tab (MidoriView* view);
38-
39-void
40-midori_view_set_tab (MidoriView* view,
41- GraniteWidgetsTab* tab);
42-#endif
43-
44 GtkWidget*
45 midori_view_get_proxy_tab_label (MidoriView* view);
46

Subscribers

People subscribed via source and target branches

to all changes: