gnome-panel r11385 - trunk/applets/notification_area

[vuntz svn gnome org]

Author: vuntz
Date: Tue Dec  9 02:36:17 2008
New Revision: 11385
URL: http://svn.gnome.org/viewvc/gnome-panel?rev=11385&view=rev

Log:
2008-12-09  Vincent Untz  <vuntz gnome org>

	* main.c:
	* na-tray-manager.[ch]:
	* na-tray.[ch]:
	* obox.[ch]: use single include for gtk+
	(get_class): s/gtk_type_class/g_type_class_peek/ (no deprecated API)


Modified:
   trunk/applets/notification_area/ChangeLog
   trunk/applets/notification_area/main.c
   trunk/applets/notification_area/na-tray-manager.c
   trunk/applets/notification_area/na-tray-manager.h
   trunk/applets/notification_area/na-tray.c
   trunk/applets/notification_area/na-tray.h
   trunk/applets/notification_area/obox.c
   trunk/applets/notification_area/obox.h

Modified: trunk/applets/notification_area/main.c
==============================================================================
--- trunk/applets/notification_area/main.c	(original)
+++ trunk/applets/notification_area/main.c	Tue Dec  9 02:36:17 2008
@@ -27,8 +27,7 @@
 #include <panel-applet-gconf.h>
 
 #include <glib/gi18n.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 #include <libgnomeui/gnome-help.h>
 
 #include "na-tray-manager.h"

Modified: trunk/applets/notification_area/na-tray-manager.c
==============================================================================
--- trunk/applets/notification_area/na-tray-manager.c	(original)
+++ trunk/applets/notification_area/na-tray-manager.c	Tue Dec  9 02:36:17 2008
@@ -34,9 +34,7 @@
 #elif defined (GDK_WINDOWING_WIN32)
 #include <gdk/gdkwin32.h>
 #endif
-#include <gtk/gtkinvisible.h>
-#include <gtk/gtksocket.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 #include "na-marshal.h"
 

Modified: trunk/applets/notification_area/na-tray-manager.h
==============================================================================
--- trunk/applets/notification_area/na-tray-manager.h	(original)
+++ trunk/applets/notification_area/na-tray-manager.h	Tue Dec  9 02:36:17 2008
@@ -24,10 +24,10 @@
 #ifndef __NA_TRAY_MANAGER_H__
 #define __NA_TRAY_MANAGER_H__
 
-#include <gtk/gtkwidget.h>
 #ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
 #endif
+#include <gtk/gtk.h>
 
 #include "na-tray-child.h"
 

Modified: trunk/applets/notification_area/na-tray.c
==============================================================================
--- trunk/applets/notification_area/na-tray.c	(original)
+++ trunk/applets/notification_area/na-tray.c	Tue Dec  9 02:36:17 2008
@@ -25,8 +25,7 @@
 #include <panel-applet.h>
 #include <panel-applet-gconf.h>
 
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 #include <libgnomeui/gnome-help.h>
 
 #include "na-tray-manager.h"

Modified: trunk/applets/notification_area/na-tray.h
==============================================================================
--- trunk/applets/notification_area/na-tray.h	(original)
+++ trunk/applets/notification_area/na-tray.h	Tue Dec  9 02:36:17 2008
@@ -24,10 +24,10 @@
 #ifndef __NA_TRAY_H__
 #define __NA_TRAY_H__
 
-#include <gtk/gtkwidget.h>
 #ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
 #endif
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/applets/notification_area/obox.c
==============================================================================
--- trunk/applets/notification_area/obox.c	(original)
+++ trunk/applets/notification_area/obox.c	Tue Dec  9 02:36:17 2008
@@ -27,8 +27,7 @@
 
 #include "obox.h"
 
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 
 static void na_obox_size_request  (GtkWidget       *widget,
 				   GtkRequisition  *requisition);
@@ -73,10 +72,10 @@
   switch (obox->orientation)
     {
     case GTK_ORIENTATION_HORIZONTAL:
-      klass = GTK_WIDGET_CLASS (gtk_type_class (GTK_TYPE_HBOX));
+      klass = GTK_WIDGET_CLASS (g_type_class_peek (GTK_TYPE_HBOX));
       break;
     case GTK_ORIENTATION_VERTICAL:
-      klass = GTK_WIDGET_CLASS (gtk_type_class (GTK_TYPE_VBOX));
+      klass = GTK_WIDGET_CLASS (g_type_class_peek (GTK_TYPE_VBOX));
       break;
     default:
       g_assert_not_reached ();

Modified: trunk/applets/notification_area/obox.h
==============================================================================
--- trunk/applets/notification_area/obox.h	(original)
+++ trunk/applets/notification_area/obox.h	Tue Dec  9 02:36:17 2008
@@ -28,7 +28,7 @@
 #ifndef __NA_OBOX_H__
 #define __NA_OBOX_H__
 
-#include <gtk/gtkbox.h>
+#include <gtk/gtk.h>
 
 #ifdef __cplusplus
 extern "C" {