diff options
Diffstat (limited to 'capplets/common')
| -rw-r--r-- | capplets/common/activate-settings-daemon.c | 2 | ||||
| -rw-r--r-- | capplets/common/capplet-util.c | 2 | ||||
| -rw-r--r-- | capplets/common/mate-theme-info.c | 6 | ||||
| -rw-r--r-- | capplets/common/theme-thumbnail.c | 2 |
4 files changed, 3 insertions, 9 deletions
diff --git a/capplets/common/activate-settings-daemon.c b/capplets/common/activate-settings-daemon.c index 794f1098..f82f0353 100644 --- a/capplets/common/activate-settings-daemon.c +++ b/capplets/common/activate-settings-daemon.c @@ -2,7 +2,7 @@ #include <config.h> #endif -#include <mate-settings-daemon/mate-settings-client.h> +#include <mate-settings-client.h> #include <gtk/gtk.h> #include <glib/gi18n.h> diff --git a/capplets/common/capplet-util.c b/capplets/common/capplet-util.c index eb2017a2..2a66e955 100644 --- a/capplets/common/capplet-util.c +++ b/capplets/common/capplet-util.c @@ -190,9 +190,7 @@ capplet_init (GOptionContext *context, #endif if (context) { -#if GLIB_CHECK_VERSION (2, 12, 0) g_option_context_set_translation_domain (context, GETTEXT_PACKAGE); -#endif g_option_context_add_group (context, gtk_get_option_group (TRUE)); if (!g_option_context_parse (context, argc, argv, &err)) { diff --git a/capplets/common/mate-theme-info.c b/capplets/common/mate-theme-info.c index 4da1ab4f..a3dddece 100644 --- a/capplets/common/mate-theme-info.c +++ b/capplets/common/mate-theme-info.c @@ -637,11 +637,7 @@ read_current_cursor_font (void) gchar *dir_name; struct dirent *file_dirent; - #if GLIB_CHECK_VERSION(2, 6, 0) - dir_name = g_build_filename(g_get_user_config_dir(), "mate", "share", "cursor-fonts", NULL); - #else // glib version < 2.6.0 - dir_name = g_build_filename(g_get_home_dir(), ".config", "mate", "share", "cursor-fonts", NULL); - #endif + dir_name = g_build_filename(g_get_user_config_dir(), "mate", "share", "cursor-fonts", NULL); if (! g_file_test (dir_name, G_FILE_TEST_EXISTS)) { g_free (dir_name); diff --git a/capplets/common/theme-thumbnail.c b/capplets/common/theme-thumbnail.c index 397a009f..ea371482 100644 --- a/capplets/common/theme-thumbnail.c +++ b/capplets/common/theme-thumbnail.c @@ -116,7 +116,7 @@ static GdkPixmap* draw_window_on_pixbuf(GtkWidget* widget) visual = gtk_widget_get_visual(widget); #if !GTK_CHECK_VERSION (3, 0, 0) - pixmap = gdk_pixmap_new(NULL, width, height, visual->depth); + pixmap = gdk_pixmap_new(NULL, width, height, gdk_visual_get_depth (visual)); gdk_drawable_set_colormap(GDK_DRAWABLE(pixmap), gtk_widget_get_colormap(widget)); #endif |