[Xfce4-commits] r24261 - in xfce4-panel/branches/4_5_nick: libxfce4panel panel

[Nick Schermer]

Author: nick
Date: 2007-01-03 18:51:28 +0000 (Wed, 03 Jan 2007)
New Revision: 24261

Modified:
   xfce4-panel/branches/4_5_nick/libxfce4panel/libxfce4panel-1.0.pc.in
   xfce4-panel/branches/4_5_nick/libxfce4panel/xfce-panel-plugin.h
   xfce4-panel/branches/4_5_nick/panel/Makefile.am
   xfce4-panel/branches/4_5_nick/panel/main.c
Log:
Revert patch


Modified: xfce4-panel/branches/4_5_nick/libxfce4panel/libxfce4panel-1.0.pc.in
===================================================================
--- xfce4-panel/branches/4_5_nick/libxfce4panel/libxfce4panel-1.0.pc.in	2007-01-03 18:46:22 UTC (rev 24260)
+++ xfce4-panel/branches/4_5_nick/libxfce4panel/libxfce4panel-1.0.pc.in	2007-01-03 18:51:28 UTC (rev 24261)
@@ -5,7 +5,7 @@
 
 Name: libxfce4panel
 Description: Library for the Xfce Panel
-Requires: gthread-2.0 gtk+-2.0 libxfce4util-1.0
+Requires: libxfce4util-1.0
 Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -lxfce4panel
 Cflags: -I${includedir}/xfce4/

Modified: xfce4-panel/branches/4_5_nick/libxfce4panel/xfce-panel-plugin.h
===================================================================
--- xfce4-panel/branches/4_5_nick/libxfce4panel/xfce-panel-plugin.h	2007-01-03 18:46:22 UTC (rev 24260)
+++ xfce4-panel/branches/4_5_nick/libxfce4panel/xfce-panel-plugin.h	2007-01-03 18:51:28 UTC (rev 24261)
@@ -21,7 +21,6 @@
 #ifndef __XFCE_PANEL_PLUGIN_H__
 #define __XFCE_PANEL_PLUGIN_H__
 
-#include <glib.h>
 #include <libxfce4panel/xfce-panel-enums.h>
 #include <libxfce4panel/xfce-panel-macros.h>
 #include <libxfce4panel/xfce-panel-plugin-iface.h>
@@ -45,9 +44,6 @@
     {                                                              \
         GtkWidget *plugin;                                         \
                                                                    \
-        if (!g_thread_supported ())                                \
-            g_thread_init (NULL);                                  \
-                                                                   \
         gtk_init (&argc, &argv);                                   \
                                                                    \
         plugin = xfce_external_panel_plugin_new (argc, argv,       \
@@ -85,9 +81,6 @@
         GtkWidget            *plugin;                                   \
         XfcePanelPluginCheck  test = (XfcePanelPluginCheck)check;       \
                                                                         \
-        if (!g_thread_supported ())                                     \
-            g_thread_init (NULL);                                       \
-                                                                        \
         gtk_init (&argc, &argv);                                        \
                                                                         \
         if (G_UNLIKELY (test(gdk_screen_get_default()) == FALSE))       \

Modified: xfce4-panel/branches/4_5_nick/panel/Makefile.am
===================================================================
--- xfce4-panel/branches/4_5_nick/panel/Makefile.am	2007-01-03 18:46:22 UTC (rev 24260)
+++ xfce4-panel/branches/4_5_nick/panel/Makefile.am	2007-01-03 18:51:28 UTC (rev 24261)
@@ -38,7 +38,6 @@
 
 xfce4_panel_CFLAGS =								\
 	$(LIBX11_CFLAGS)							\
-	$(GTHREAD_CFLAGS)							\
 	$(LIBSTARTUP_NOTIFICATION_CFLAGS)					\
 	$(LIBXFCE4UTIL_CFLAGS)							\
 	$(LIBXFCEGUI4_CFLAGS)							\
@@ -50,7 +49,6 @@
 
 xfce4_panel_LDADD =								\
 	$(top_builddir)/libxfce4panel/libxfce4panel.la				\
-	$(GTHREAD_LIBS)								\
 	$(LIBXFCE4UTIL_LIBS)							\
 	$(LIBXFCEGUI4_LIBS)							\
 	$(LIBSTARTUP_NOTIFICATION_LIBS)						\

Modified: xfce4-panel/branches/4_5_nick/panel/main.c
===================================================================
--- xfce4-panel/branches/4_5_nick/panel/main.c	2007-01-03 18:46:22 UTC (rev 24260)
+++ xfce4-panel/branches/4_5_nick/panel/main.c	2007-01-03 18:51:28 UTC (rev 24261)
@@ -34,7 +34,6 @@
 #include <locale.h>
 #endif
 
-#include <glib.h>
 #include <gtk/gtk.h>
 #include <libxfce4util/libxfce4util.h>
 
@@ -82,10 +81,6 @@
     /* application name */
     g_set_application_name (PACKAGE_NAME);
     
-    /* initialize the GThread system */
-    if (!g_thread_supported ())
-        g_thread_init (NULL);
-
     TIMER_ELAPSED ("start gtk_init_with_args ()");
 
     /* initialize gtk */