From 2be32a55532fbb010f83472064435aae49e36270 Mon Sep 17 00:00:00 2001 From: monsta Date: Sun, 28 Jan 2018 22:42:47 +0300 Subject: require GTK+ 3.22 and GLib 2.50 --- libslab/app-shell.c | 8 -------- libslab/application-tile.c | 9 +-------- libslab/nameplate-tile.c | 4 ---- libslab/slab-mate-util.c | 4 ---- libslab/slab-section.c | 4 ---- libslab/tile-action.c | 4 ---- 6 files changed, 1 insertion(+), 32 deletions(-) (limited to 'libslab') diff --git a/libslab/app-shell.c b/libslab/app-shell.c index 85934a7a..c1765975 100644 --- a/libslab/app-shell.c +++ b/libslab/app-shell.c @@ -416,11 +416,7 @@ create_actions_section (AppShellData * app_data, const gchar * title, header = gtk_label_new (action->name); gtk_label_set_line_wrap (GTK_LABEL (header), TRUE); gtk_label_set_max_width_chars (GTK_LABEL (header), 0); -#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL (header), 0.0); -#else - gtk_misc_set_alignment (GTK_MISC (header), 0.0, 0.5); -#endif launcher = nameplate_tile_new (NULL, NULL, header, NULL); g_object_set_data (G_OBJECT (launcher), APP_ACTION_KEY, action->item); @@ -707,11 +703,7 @@ create_application_category_sections (AppShellData * app_data) GtkWidget *hbox; GtkWidget *table; -#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL (header), 0.0); -#else - gtk_misc_set_alignment (GTK_MISC (header), 0.0, 0.5); -#endif data->group_launcher = TILE (nameplate_tile_new (NULL, NULL, header, NULL)); g_object_ref (data->group_launcher); diff --git a/libslab/application-tile.c b/libslab/application-tile.c index 523643df..2e41eaba 100644 --- a/libslab/application-tile.c +++ b/libslab/application-tile.c @@ -412,11 +412,7 @@ create_header (const gchar *name) header = gtk_label_new (name); gtk_label_set_line_wrap (GTK_LABEL (header), TRUE); -#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL (header), 0.0); -#else - gtk_misc_set_alignment (GTK_MISC (header), 0.0, 0.5); -#endif g_signal_connect ( G_OBJECT (header), @@ -435,11 +431,8 @@ create_subheader (const gchar *desc) subheader = gtk_label_new (desc); gtk_label_set_ellipsize (GTK_LABEL (subheader), PANGO_ELLIPSIZE_END); -#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL (subheader), 0.0); -#else - gtk_misc_set_alignment (GTK_MISC (subheader), 0.0, 0.5); -#endif + gtk_widget_modify_fg ( subheader, GTK_STATE_NORMAL, diff --git a/libslab/nameplate-tile.c b/libslab/nameplate-tile.c index fa84840b..8e282ab6 100644 --- a/libslab/nameplate-tile.c +++ b/libslab/nameplate-tile.c @@ -242,11 +242,7 @@ nameplate_tile_setup (NameplateTile *this) if (GTK_IS_WIDGET (this->subheader)) gtk_container_add (priv->subheader_ctnr, this->subheader); -#if GTK_CHECK_VERSION(3,20,0) gtk_widget_set_focus_on_click (GTK_WIDGET (this), FALSE); -#else - gtk_button_set_focus_on_click (GTK_BUTTON (this), FALSE); -#endif } static void diff --git a/libslab/slab-mate-util.c b/libslab/slab-mate-util.c index efb4a535..2eb55209 100644 --- a/libslab/slab-mate-util.c +++ b/libslab/slab-mate-util.c @@ -118,11 +118,7 @@ open_desktop_item_help (MateDesktopItem * desktop_item) help_uri = g_strdup_printf ("help:%s", doc_path); error = NULL; -#if GTK_CHECK_VERSION (3, 22, 0) if (!gtk_show_uri_on_window (NULL, help_uri, gtk_get_current_event_time (), &error)) -#else - if (!gtk_show_uri (libslab_get_current_screen (), help_uri, gtk_get_current_event_time (), &error)) -#endif { g_warning ("error opening %s [%s]\n", help_uri, error->message); diff --git a/libslab/slab-section.c b/libslab/slab-section.c index fec9634d..068048d6 100644 --- a/libslab/slab-section.c +++ b/libslab/slab-section.c @@ -148,11 +148,7 @@ slab_section_new_with_markup (const gchar * title_markup, SlabStyle style) section->title = gtk_label_new (title_markup); gtk_label_set_use_markup (GTK_LABEL (section->title), TRUE); -#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL (section->title), 0.0); -#else - gtk_misc_set_alignment (GTK_MISC (section->title), 0.0, 0.5); -#endif gtk_widget_set_name (GTK_WIDGET (section), widget_theming_name); g_signal_connect (G_OBJECT (section), "style-set", G_CALLBACK (slab_section_style_set), diff --git a/libslab/tile-action.c b/libslab/tile-action.c index c87f2dad..4934cbd3 100644 --- a/libslab/tile-action.c +++ b/libslab/tile-action.c @@ -83,11 +83,7 @@ tile_action_set_menu_item_label (TileAction * this, const gchar * markup) { label = gtk_label_new (markup); gtk_label_set_use_markup (GTK_LABEL (label), TRUE); -#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL (label), 0.0); -#else - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); -#endif this->menu_item = GTK_MENU_ITEM (gtk_menu_item_new ()); gtk_container_add (GTK_CONTAINER (this->menu_item), label); -- cgit v1.2.1