The Sound Menu

Merge lp:~ken-vandine/indicator-sound/ifdef into lp:indicator-sound/fourth

  1. ifdef
  2. Merge into trunk_4
Proposed by Ken VanDine
Status: Merged
Merge reported by: Conor Curran
Merged at revision: not available
Proposed branch: lp:~ken-vandine/indicator-sound/ifdef
Merge into: lp:indicator-sound/fourth
Diff against target: 18 lines (+2/-0)
1 file modified
src/metadata-widget.c (+2/-0)
To merge this branch: bzr merge lp:~ken-vandine/indicator-sound/ifdef
Reviewer Review Type Date Requested Status
Conor Curran (community) Approve
Review via email: mp+66163@code.launchpad.net

Description of the change

Wrap more gtk3 only code in an ifdef

To post a comment you must log in.
Revision history for this message
Conor Curran (cjcurran) :
review: Approve
Revision history for this message
Conor Curran (cjcurran) wrote :

This fix is not needed after some work in a more recent branch.

Revision history for this message
Conor Curran (cjcurran) wrote :

that more recent branch being
https://code.launchpad.net/~cjcurran/indicator-sound/collapse-expand/+merge/67023

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/metadata-widget.c'
2--- src/metadata-widget.c 2011-06-28 10:39:16 +0000
3+++ src/metadata-widget.c 2011-06-28 15:13:49 +0000
4@@ -59,12 +59,14 @@
5 static void metadata_widget_set_style (GtkWidget* button, GtkStyle* style);
6 static void metadata_widget_set_twin_item (MetadataWidget* self,
7 DbusmenuMenuitem* twin_item);
8+#if GTK_CHECK_VERSION(3, 0, 0)
9 static void metadata_get_preferred_width (GtkWidget *widget,
10 gint *minimal_width,
11 gint *natural_width);
12 static void metadata_get_preferred_height (GtkWidget *widget,
13 gint *minimal_width,
14 gint *natural_width);
15+#endif
16
17
18 // keyevent consumers

Subscribers

People subscribed via source and target branches