[gthumb] removed code used with gtk+ version lower then 3.13
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gthumb] removed code used with gtk+ version lower then 3.13
- Date: Sun, 26 Feb 2017 10:37:34 +0000 (UTC)
commit f113a6ee1c52b74a43f4ee56d2b0af937fac5455
Author: Paolo Bacchilega <paobac src gnome org>
Date: Sun Feb 26 11:22:55 2017 +0100
removed code used with gtk+ version lower then 3.13
gthumb/gth-browser.c | 22 ----------------------
gthumb/gth-window.c | 2 --
2 files changed, 0 insertions(+), 24 deletions(-)
---
diff --git a/gthumb/gth-browser.c b/gthumb/gth-browser.c
index 5d24bb3..e9a24e6 100644
--- a/gthumb/gth-browser.c
+++ b/gthumb/gth-browser.c
@@ -4468,40 +4468,20 @@ gth_browser_init (GthBrowser *browser)
gtk_header_bar_pack_start (GTK_HEADER_BAR (header_bar),
browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_BROWSER_NAVIGATION]);
gtk_header_bar_pack_start (GTK_HEADER_BAR (header_bar),
browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_BROWSER_LOCATIONS]);
gtk_header_bar_pack_start (GTK_HEADER_BAR (header_bar),
browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_BROWSER_COMMANDS]);
-#if ! GTK_CHECK_VERSION(3,11,4)
- gtk_header_bar_pack_end (GTK_HEADER_BAR (header_bar),
browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_BROWSER_OTHER_VIEW]);
- gtk_header_bar_pack_end (GTK_HEADER_BAR (header_bar),
browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_BROWSER_VIEW]);
- gtk_header_bar_pack_end (GTK_HEADER_BAR (header_bar),
browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_BROWSER_TOOLS]);
-#endif
gtk_header_bar_pack_start (GTK_HEADER_BAR (header_bar),
browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_VIEWER_NAVIGATION]);
gtk_header_bar_pack_start (GTK_HEADER_BAR (header_bar),
browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_VIEWER_OTHER_VIEW]);
- gtk_header_bar_pack_start (GTK_HEADER_BAR (header_bar),
browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_VIEWER_VIEW]);
- gtk_header_bar_pack_start (GTK_HEADER_BAR (header_bar),
browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_VIEWER_COMMANDS]);
- gtk_header_bar_pack_start (GTK_HEADER_BAR (header_bar),
browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_VIEWER_OTHER_COMMANDS]);
-#if ! GTK_CHECK_VERSION(3,11,4)
- gtk_header_bar_pack_end (GTK_HEADER_BAR (header_bar),
browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_VIEWER_SIDEBAR]);
- gtk_header_bar_pack_end (GTK_HEADER_BAR (header_bar),
browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_VIEWER_EDIT]);
-#endif
gtk_header_bar_pack_start (GTK_HEADER_BAR (header_bar),
browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_EDITOR_NAVIGATION]);
gtk_header_bar_pack_start (GTK_HEADER_BAR (header_bar),
browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_EDITOR_VIEW]);
-#if ! GTK_CHECK_VERSION(3,11,4)
- gtk_header_bar_pack_end (GTK_HEADER_BAR (header_bar),
browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_EDITOR_COMMANDS]);
- gtk_header_bar_pack_end (GTK_HEADER_BAR (header_bar),
browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_EDITOR_APPLY]);
-#endif
/* gears menu button */
builder = _gtk_builder_new_from_resource ("gears-menu.ui");
menu = G_MENU_MODEL (gtk_builder_get_object (builder, "menu"));
browser->priv->menu_button = _gtk_menu_button_new_for_header_bar (NULL);
-#if ! GTK_CHECK_VERSION(3,13,0)
- gtk_container_add (GTK_CONTAINER (browser->priv->menu_button), gtk_image_new_from_icon_name
("emblem-system-symbolic", GTK_ICON_SIZE_MENU));
-#else
gtk_menu_button_set_direction (GTK_MENU_BUTTON (browser->priv->menu_button), GTK_ARROW_NONE);
-#endif
gtk_menu_button_set_menu_model (GTK_MENU_BUTTON (browser->priv->menu_button), menu);
gtk_widget_show_all (browser->priv->menu_button);
gtk_header_bar_pack_end (GTK_HEADER_BAR (header_bar), browser->priv->menu_button);
@@ -4512,7 +4492,6 @@ gth_browser_init (GthBrowser *browser)
_gtk_window_add_accelerators_from_menu ((GTK_WINDOW (browser)), menu);
g_object_unref (builder);
-#if GTK_CHECK_VERSION(3,11,4)
gtk_header_bar_pack_end (GTK_HEADER_BAR (header_bar),
browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_BROWSER_TOOLS]);
gtk_header_bar_pack_end (GTK_HEADER_BAR (header_bar),
browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_BROWSER_VIEW]);
@@ -4521,7 +4500,6 @@ gth_browser_init (GthBrowser *browser)
gtk_header_bar_pack_end (GTK_HEADER_BAR (header_bar),
browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_EDITOR_APPLY]);
gtk_header_bar_pack_end (GTK_HEADER_BAR (header_bar),
browser->priv->header_sections[GTH_BROWSER_HEADER_SECTION_EDITOR_COMMANDS]);
-#endif
/* browser navigation */
diff --git a/gthumb/gth-window.c b/gthumb/gth-window.c
index 4ff143e..57221f2 100644
--- a/gthumb/gth-window.c
+++ b/gthumb/gth-window.c
@@ -149,7 +149,6 @@ _gth_window_add_header_bar (GthWindow *self)
g_object_add_weak_pointer (G_OBJECT (self->priv->headerbar), (gpointer *) &self->priv->headerbar);
-#if GTK_CHECK_VERSION(3,12,0)
{
gboolean shell_shows_app_menu;
char *decoration_layout;
@@ -173,7 +172,6 @@ _gth_window_add_header_bar (GthWindow *self)
g_free (decoration_layout);
}
-#endif
self->priv->title = gth_window_title_new ();
gtk_widget_show (self->priv->title);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]