summaryrefslogtreecommitdiff
path: root/gsearchtool/src/gsearchtool-support.c
diff options
context:
space:
mode:
authormonsta <[email protected]>2016-11-22 15:49:16 +0300
committermonsta <[email protected]>2016-11-22 15:49:16 +0300
commitea481767c4e3ec19136a5b61ad46f244a9a5ffa7 (patch)
treebbcceb1d2a0be587e7127109f57e41e9e9b43f98 /gsearchtool/src/gsearchtool-support.c
parent8f9a34f003061d7c5e6cfe8a8cb64ec6e98d7c4a (diff)
downloadmate-utils-ea481767c4e3ec19136a5b61ad46f244a9a5ffa7.tar.bz2
mate-utils-ea481767c4e3ec19136a5b61ad46f244a9a5ffa7.tar.xz
move to GTK+3 (>= 3.14), drop GTK+2 code and --with-gtk build option
and require mate-panel >= 1.17
Diffstat (limited to 'gsearchtool/src/gsearchtool-support.c')
-rw-r--r--gsearchtool/src/gsearchtool-support.c20
1 files changed, 0 insertions, 20 deletions
diff --git a/gsearchtool/src/gsearchtool-support.c b/gsearchtool/src/gsearchtool-support.c
index d12cdbfb..b4bdc0b1 100644
--- a/gsearchtool/src/gsearchtool-support.c
+++ b/gsearchtool/src/gsearchtool-support.c
@@ -897,11 +897,7 @@ get_themed_icon_pixbuf (GThemedIcon * icon,
g_clear_error (&error);
}
-#if GTK_CHECK_VERSION (3, 8, 0)
g_object_unref (icon_info);
-#else
- gtk_icon_info_free (icon_info);
-#endif
g_strfreev (icon_names);
return pixbuf;
@@ -952,10 +948,8 @@ open_file_with_filemanager (GtkWidget * window,
GDesktopAppInfo * d_app_info;
GKeyFile * key_file;
GdkAppLaunchContext * ctx = NULL;
-#if GTK_CHECK_VERSION (3, 0, 0)
GdkScreen *screen;
GdkDisplay *display;
-#endif
GList * list = NULL;
GAppInfo * g_app_info;
GFile * g_file;
@@ -995,13 +989,9 @@ open_file_with_filemanager (GtkWidget * window,
d_app_info = g_desktop_app_info_new_from_keyfile (key_file);
if (d_app_info != NULL) {
-#if GTK_CHECK_VERSION (3, 0, 0)
screen = gtk_widget_get_screen (GTK_WIDGET (window));
display = gdk_screen_get_display (screen);
ctx = gdk_display_get_app_launch_context (display);
-#else
- ctx = gdk_app_launch_context_new ();
-#endif
gdk_app_launch_context_set_screen (ctx, gtk_widget_get_screen (window));
result = g_app_info_launch_uris (G_APP_INFO (d_app_info), list, G_APP_LAUNCH_CONTEXT (ctx), NULL);
@@ -1029,9 +1019,7 @@ open_file_with_application (GtkWidget * window,
GAppInfo * app)
{
GdkAppLaunchContext * context;
-#if GTK_CHECK_VERSION (3, 0, 0)
GdkDisplay *display;
-#endif
GdkScreen * screen;
gboolean result;
@@ -1040,12 +1028,8 @@ open_file_with_application (GtkWidget * window,
}
screen = gtk_widget_get_screen (window);
-#if GTK_CHECK_VERSION (3, 0, 0)
display = gdk_screen_get_display (screen);
context = gdk_display_get_app_launch_context (display);
-#else
- context = gdk_app_launch_context_new ();
-#endif
gdk_app_launch_context_set_screen (context, screen);
if (app == NULL) {
@@ -1146,11 +1130,7 @@ gsearchtool_button_new_with_stock_icon (const gchar * string,
label = gtk_label_new_with_mnemonic (string);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), GTK_WIDGET (button));
image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON);
-#if GTK_CHECK_VERSION (3, 0, 0)
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
-#else
- hbox = gtk_hbox_new (FALSE, 2);
-#endif
align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
gtk_box_pack_end (GTK_BOX (hbox), label, FALSE, FALSE, 0);