[geary/pantheon_mail: 26/32] remove if gtk 3.12
- From: Javier Jardón Cabezas <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geary/pantheon_mail: 26/32] remove if gtk 3.12
- Date: Wed, 25 Nov 2015 19:52:56 +0000 (UTC)
commit af3ac3e5872fc9dff7ea557bc0662e2e062074bf
Author: Daniel Foré <daniel elementary io>
Date: Tue Nov 24 13:21:25 2015 -0800
remove if gtk 3.12
src/client/composer/composer-headerbar.vala | 17 ++---------------
1 files changed, 2 insertions(+), 15 deletions(-)
---
diff --git a/src/client/composer/composer-headerbar.vala b/src/client/composer/composer-headerbar.vala
index 25d7a81..031b7e7 100644
--- a/src/client/composer/composer-headerbar.vala
+++ b/src/client/composer/composer-headerbar.vala
@@ -83,11 +83,6 @@ public class ComposerHeaderbar : PillHeaderbar {
add_start(detach_start);
add_start(attach_buttons);
add_start(recipients);
-#if !GTK_3_12
- add_end(send_button);
- add_end(close_buttons);
- add_end(detach_end);
-#endif
Gtk.MenuButton menu = new Gtk.MenuButton();
menu.image = new Gtk.Image.from_icon_name("open-menu", Gtk.IconSize.LARGE_TOOLBAR);
@@ -100,25 +95,17 @@ public class ComposerHeaderbar : PillHeaderbar {
target_value = (state == ComposerWidget.ComposerState.NEW);
return true;
});
-#if GTK_3_12
+
add_end(detach_end);
add_end(close_buttons);
add_end(send_button);
-#endif
-#if GTK_3_12
notify["decoration-layout"].connect(set_detach_button_side);
-#else
- get_style_context().changed.connect(set_detach_button_side);
-#endif
+
realize.connect(set_detach_button_side);
notify["state"].connect((s, p) => {
if (state == ComposerWidget.ComposerState.DETACHED) {
-#if GTK_3_12
notify["decoration-layout"].disconnect(set_detach_button_side);
-#else
- get_style_context().changed.disconnect(set_detach_button_side);
-#endif
detach_start.visible = detach_end.visible = false;
}
});
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]