From fdbc0f891cfebf7eb04d96fc2fac5d083bcc1581 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sat, 29 Mar 2014 20:37:30 +0100 Subject: [PATCH] Avoid more warnings when compiling with Gtk+ 3.0 --- src/desktop.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/src/desktop.c b/src/desktop.c index d75497d..a15dbf6 100644 --- a/src/desktop.c +++ b/src/desktop.c @@ -1,5 +1,5 @@ /* $Id$ */ -/* Copyright (c) 2007-2013 Pierre Pronchery */ +/* Copyright (c) 2007-2014 Pierre Pronchery */ /* This file is part of DeforaOS Desktop Browser */ /* This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -1678,6 +1678,10 @@ static void _desktop_draw_background(Desktop * desktop, GdkColor * color, gint n = 1; gint i; +#ifdef DEBUG + fprintf(stderr, "DEBUG: %s(\"%s\", %u, %s)\n", __func__, filename, how, + extend ? "TRUE" : "FALSE"); +#endif if(how == DESKTOP_HOW_NONE) return; /* draw default color */ @@ -1934,7 +1938,11 @@ static void _preferences_background(Desktop * desktop, GtkWidget * notebook) #endif gtk_container_set_border_width(GTK_CONTAINER(vbox2), 4); group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); +#if GTK_CHECK_VERSION(3, 0, 0) + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); +#else hbox = gtk_hbox_new(FALSE, 0); +#endif label = gtk_label_new(_("Default color: ")); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); gtk_size_group_add_widget(group, label); @@ -1942,7 +1950,11 @@ static void _preferences_background(Desktop * desktop, GtkWidget * notebook) desktop->pr_color = gtk_color_button_new(); gtk_box_pack_start(GTK_BOX(hbox), desktop->pr_color, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0); +#if GTK_CHECK_VERSION(3, 0, 0) + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); +#else hbox = gtk_hbox_new(FALSE, 0); +#endif label = gtk_label_new(_("Wallpaper: ")); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); gtk_size_group_add_widget(group, label); @@ -1971,7 +1983,11 @@ static void _preferences_background(Desktop * desktop, GtkWidget * notebook) gtk_box_pack_start(GTK_BOX(hbox), desktop->pr_background, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0); +#if GTK_CHECK_VERSION(3, 0, 0) + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); +#else hbox = gtk_hbox_new(FALSE, 0); +#endif label = gtk_label_new(_("Position: ")); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); gtk_size_group_add_widget(group, label); @@ -2029,7 +2045,11 @@ static void _preferences_icons(Desktop * desktop, GtkWidget * notebook) gtk_container_set_border_width(GTK_CONTAINER(vbox2), 4); group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); /* icons */ +#if GTK_CHECK_VERSION(3, 0, 0) + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); +#else hbox = gtk_hbox_new(FALSE, 0); +#endif label = gtk_label_new(_("Layout: ")); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); gtk_size_group_add_widget(group, label); @@ -2052,7 +2072,11 @@ static void _preferences_icons(Desktop * desktop, GtkWidget * notebook) gtk_box_pack_start(GTK_BOX(hbox), desktop->pr_ilayout, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0); /* monitor */ +#if GTK_CHECK_VERSION(3, 0, 0) + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); +#else hbox = gtk_hbox_new(FALSE, 0); +#endif label = gtk_label_new(_("Monitor: ")); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); gtk_size_group_add_widget(group, label); @@ -2065,7 +2089,11 @@ static void _preferences_icons(Desktop * desktop, GtkWidget * notebook) gtk_box_pack_start(GTK_BOX(hbox), desktop->pr_imonitor, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0); /* background color */ +#if GTK_CHECK_VERSION(3, 0, 0) + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); +#else hbox = gtk_hbox_new(FALSE, 0); +#endif label = gtk_label_new(_("Background color: ")); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); gtk_size_group_add_widget(group, label); @@ -2074,7 +2102,11 @@ static void _preferences_icons(Desktop * desktop, GtkWidget * notebook) gtk_box_pack_start(GTK_BOX(hbox), desktop->pr_ibcolor, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0); /* foreground color */ +#if GTK_CHECK_VERSION(3, 0, 0) + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); +#else hbox = gtk_hbox_new(FALSE, 0); +#endif label = gtk_label_new(_("Foreground color: ")); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); gtk_size_group_add_widget(group, label); @@ -2083,7 +2115,11 @@ static void _preferences_icons(Desktop * desktop, GtkWidget * notebook) gtk_box_pack_start(GTK_BOX(hbox), desktop->pr_ifcolor, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0); /* font */ +#if GTK_CHECK_VERSION(3, 0, 0) + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); +#else hbox = gtk_hbox_new(FALSE, 0); +#endif label = gtk_label_new(_("Font: ")); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); gtk_size_group_add_widget(group, label); @@ -2112,7 +2148,11 @@ static void _preferences_monitors(Desktop * desktop, GtkWidget * notebook) #endif gtk_container_set_border_width(GTK_CONTAINER(vbox2), 4); /* selector */ +#if GTK_CHECK_VERSION(3, 0, 0) + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); +#else hbox = gtk_hbox_new(FALSE, 0); +#endif label = gtk_label_new(_("Monitor: ")); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); gtk_size_group_add_widget(group, label); @@ -2125,7 +2165,11 @@ static void _preferences_monitors(Desktop * desktop, GtkWidget * notebook) gtk_box_pack_start(GTK_BOX(hbox), desktop->pr_monitors, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0); /* geometry */ +#if GTK_CHECK_VERSION(3, 0, 0) + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); +#else hbox = gtk_hbox_new(FALSE, 0); +#endif label = gtk_label_new(_("Resolution: ")); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); gtk_size_group_add_widget(group, label); @@ -2136,7 +2180,11 @@ static void _preferences_monitors(Desktop * desktop, GtkWidget * notebook) 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0); /* size */ +#if GTK_CHECK_VERSION(3, 0, 0) + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); +#else hbox = gtk_hbox_new(FALSE, 0); +#endif label = gtk_label_new(_("Size: ")); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); gtk_size_group_add_widget(group, label); @@ -2147,7 +2195,11 @@ static void _preferences_monitors(Desktop * desktop, GtkWidget * notebook) 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0); /* refresh */ +#if GTK_CHECK_VERSION(3, 0, 0) + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); +#else hbox = gtk_hbox_new(FALSE, 0); +#endif label = gtk_label_new(NULL); gtk_size_group_add_widget(group, label); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0);