Updating branch refs/heads/master to 2afe516e9bca1e67948d3a028e1e44875296f068 (commit) from 045b9f3a4fa9f105355b01641d0288c88463be12 (commit)
commit 2afe516e9bca1e67948d3a028e1e44875296f068 Author: Jérôme Guelfucci <jero...@xfce.org> Date: Thu Aug 15 11:50:44 2013 +0200 g_thread_init is deprecated. xfce4-mixer/main.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/xfce4-mixer/main.c b/xfce4-mixer/main.c index 0c5026c..9e8417b 100644 --- a/xfce4-mixer/main.c +++ b/xfce4-mixer/main.c @@ -10,12 +10,12 @@ * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. */ @@ -71,7 +71,7 @@ message_received (UniqueApp *app, -int +int main (int argc, char **argv) { @@ -91,9 +91,11 @@ main (int argc, /* Setup translation domain */ xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8"); +#if !GLIB_CHECK_VERSION(2, 32, 0) /* Initialize the threading system */ if (G_LIKELY (!g_thread_supported ())) g_thread_init (NULL); +#endif /* Set application name */ g_set_application_name (_("Audio Mixer")); _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits