summaryrefslogtreecommitdiff
path: root/capplets/appearance/appearance-main.c
diff options
context:
space:
mode:
authormonsta <[email protected]>2016-12-02 00:45:36 +0300
committermonsta <[email protected]>2016-12-02 00:50:14 +0300
commit0c27d18ab5efb721a2f02549767016c81fc6ce2c (patch)
tree76b7b89cface072e011a3757a833e9090bab44f2 /capplets/appearance/appearance-main.c
parent1aa83d45ebf9599c6d4d3f47211c3961282e98f0 (diff)
downloadmate-control-center-0c27d18ab5efb721a2f02549767016c81fc6ce2c.tar.bz2
mate-control-center-0c27d18ab5efb721a2f02549767016c81fc6ce2c.tar.xz
move to GTK+3 (>= 3.14), drop GTK+2 code and --with-gtk build option
and require libmatekbd, libmate-desktop, marco, m-s-d >= 1.17
Diffstat (limited to 'capplets/appearance/appearance-main.c')
-rw-r--r--capplets/appearance/appearance-main.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/capplets/appearance/appearance-main.c b/capplets/appearance/appearance-main.c
index 91040e62..b2b77353 100644
--- a/capplets/appearance/appearance-main.c
+++ b/capplets/appearance/appearance-main.c
@@ -40,11 +40,6 @@ init_appearance_data (int *argc, char ***argv, GOptionContext *context)
GtkBuilder *ui;
GError *err = NULL;
-#if !GTK_CHECK_VERSION (3, 0, 0)
- gdk_threads_init ();
- gdk_threads_enter ();
-#endif
-
theme_thumbnail_factory_init (*argc, *argv);
capplet_init (context, argc, argv);
activate_settings_daemon ();
@@ -147,9 +142,7 @@ main (int argc, char **argv)
{
AppearanceData *data;
GtkWidget *w;
-#if GTK_CHECK_VERSION(3, 0, 0)
GtkStyleContext *context;
-#endif
gchar *install_filename = NULL;
gchar *start_page = NULL;
@@ -202,10 +195,9 @@ main (int argc, char **argv)
/* prepare the main window */
w = appearance_capplet_get_widget (data, "appearance_window");
-#if GTK_CHECK_VERSION(3, 0, 0)
context = gtk_widget_get_style_context (GTK_WIDGET (w));
gtk_style_context_add_class (context, "appearance-window");
-#endif
+
capplet_set_icon (w, "preferences-desktop-theme");
gtk_widget_show_all (w);
@@ -247,10 +239,6 @@ main (int argc, char **argv)
/* start the mainloop */
gtk_main ();
-#if !GTK_CHECK_VERSION (3, 0, 0)
- gdk_threads_leave ();
-#endif
-
/* free stuff */
g_free (data);