[Xfce4-commits] [apps/gigolo] 12/26: Drop GTK 2.14 specific code

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

l   a   n   d   r   y       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository apps/gigolo.

commit e0d82d55ddf1db7b085dec903ec2e7835df071bd
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Mon Oct 22 22:39:26 2018 -0400

    Drop GTK 2.14 specific code
---
 src/browsenetworkpanel.c | 13 +++++--------
 src/window.c             | 23 ++++++++---------------
 2 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/src/browsenetworkpanel.c b/src/browsenetworkpanel.c
index 127c1ad..49dee28 100644
--- a/src/browsenetworkpanel.c
+++ b/src/browsenetworkpanel.c
@@ -405,14 +405,11 @@ static void tree_prepare(GigoloBrowseNetworkPanel *panel)
 
     column = gtk_tree_view_column_new();
 
-	if (gtk_check_version(2, 14, 0) == NULL)
-	{
-		icon_renderer = gtk_cell_renderer_pixbuf_new();
-		gtk_tree_view_column_pack_start(column, icon_renderer, FALSE);
-		gtk_tree_view_column_set_attributes(column, icon_renderer,
-			"gicon", GIGOLO_BROWSE_NETWORK_COL_ICON, NULL);
-		g_object_set(icon_renderer, "xalign", 0.0, NULL);
-	}
+	icon_renderer = gtk_cell_renderer_pixbuf_new();
+	gtk_tree_view_column_pack_start(column, icon_renderer, FALSE);
+	gtk_tree_view_column_set_attributes(column, icon_renderer,
+		"gicon", GIGOLO_BROWSE_NETWORK_COL_ICON, NULL);
+	g_object_set(icon_renderer, "xalign", 0.0, NULL);
 
 	text_renderer = gtk_cell_renderer_text_new();
 	gtk_tree_view_set_enable_search(GTK_TREE_VIEW(tree), FALSE);
diff --git a/src/window.c b/src/window.c
index a422a94..a36a3d5 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1431,15 +1431,12 @@ static void create_tree_view(GigoloWindow *window)
 	sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(priv->treeview));
 	gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE);
 
-	if (gtk_check_version(2, 14, 0) == NULL)
-	{
-		renderer = gtk_cell_renderer_pixbuf_new();
-		column = gtk_tree_view_column_new_with_attributes(NULL, renderer,
-			"gicon", GIGOLO_WINDOW_COL_PIXBUF, NULL);
-		gtk_tree_view_column_set_sort_indicator(column, FALSE);
-		gtk_tree_view_column_set_resizable(column, TRUE);
-		gtk_tree_view_append_column(GTK_TREE_VIEW(priv->treeview), column);
-	}
+	renderer = gtk_cell_renderer_pixbuf_new();
+	column = gtk_tree_view_column_new_with_attributes(NULL, renderer,
+		"gicon", GIGOLO_WINDOW_COL_PIXBUF, NULL);
+	gtk_tree_view_column_set_sort_indicator(column, FALSE);
+	gtk_tree_view_column_set_resizable(column, TRUE);
+	gtk_tree_view_append_column(GTK_TREE_VIEW(priv->treeview), column);
 
 	renderer = gtk_cell_renderer_toggle_new();
 	column = gtk_tree_view_column_new_with_attributes(
@@ -1495,12 +1492,8 @@ static void create_icon_view(GigoloWindow *window)
 		"xalign", 0.5,
 		"yalign", 1.0, NULL);
 	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(priv->iconview), renderer, FALSE);
-	if (gtk_check_version(2, 14, 0) == NULL)
-		gtk_cell_layout_add_attribute(GTK_CELL_LAYOUT(priv->iconview), renderer,
-			"gicon", GIGOLO_WINDOW_COL_PIXBUF);
-	else
-		gtk_cell_layout_add_attribute(GTK_CELL_LAYOUT(priv->iconview), renderer,
-			"icon-name", GIGOLO_WINDOW_COL_ICON_NAME);
+	gtk_cell_layout_add_attribute(GTK_CELL_LAYOUT(priv->iconview), renderer,
+		"gicon", GIGOLO_WINDOW_COL_PIXBUF);
 
 	renderer = gtk_cell_renderer_text_new();
 	g_object_set(renderer, "xalign", 0.5, "yalign", 0.0, NULL);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.