Sophie: awn-extras-applets-0.4.0-2.mga2 src

awn-extras-applets-0.4.0-2.mga2.src.rpm

Index: applets/maintained/garbage/applet.c
===================================================================
--- applets/maintained/garbage/applet.c
+++ applets/maintained/garbage/applet.c	2012-01-15 03:33:27.060935456 +0100
@@ -33,7 +33,6 @@
 #include <libdesktop-agnostic/config.h>
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
-#include <glib/gi18n.h>
 #include <float.h>
 #include <math.h>
 #include <locale.h>
Index: applets/maintained/garbage/prefs.c
===================================================================
--- applets/maintained/garbage/prefs.c
+++ applets/maintained/garbage/prefs.c	2012-01-15 03:33:27.062935430 +0100
@@ -27,7 +27,6 @@
 #include <glib-object.h>
 #include <gtk/gtk.h>
 #include <libawn/libawn.h>
-#include <glib/gi18n.h>
 #include <stdlib.h>
 #include <string.h>
 
Index: applets/maintained/digital-clock/digital-clock.c
===================================================================
--- applets/maintained/digital-clock/digital-clock.c
+++ applets/maintained/digital-clock/digital-clock.c	2012-01-15 03:33:27.063935417 +0100
@@ -30,7 +30,6 @@
 #include <libdesktop-agnostic/config.h>
 #include <stdlib.h>
 #include <string.h>
-#include <glib/gi18n.h>
 #include <gdk/gdk.h>
 #include <gdk-pixbuf/gdk-pixdata.h>
 #include <float.h>
Index: applets/maintained/showdesktop/applet.c
===================================================================
--- applets/maintained/showdesktop/applet.c
+++ applets/maintained/showdesktop/applet.c	2012-01-15 03:33:27.065935391 +0100
@@ -30,7 +30,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <libwnck/libwnck.h>
-#include <glib/gi18n.h>
 #include <gdk/gdk.h>
 #include <config.h>
 #include <locale.h>
Index: applets/maintained/notification-daemon/daemon.h
===================================================================
--- applets/maintained/notification-daemon/daemon.h
+++ applets/maintained/notification-daemon/daemon.h	2012-01-15 03:33:27.068935355 +0100
@@ -31,8 +31,6 @@
 
 #include <libawn/awn-applet.h>
 #include <libawn/awn-applet-simple.h>
-#include <glib/gmacros.h>
-#include <glib/gerror.h>
 
 #include <libawn/awn-dialog.h>
 #include <libawn/awn-cairo-utils.h>
Index: applets/maintained/notification-daemon/engines.c
===================================================================
--- applets/maintained/notification-daemon/engines.c
+++ applets/maintained/notification-daemon/engines.c	2012-01-15 03:33:27.069935343 +0100
@@ -38,8 +38,6 @@
 
 
 #include <libawn/awn-applet.h>
-#include <glib/gmacros.h>
-#include <glib/gerror.h>
 
 #include <libawn/awn-dialog.h>
 #include <libawn/awn-applet-simple.h>
Index: applets/maintained/cairo-menu/applet.c
===================================================================
--- applets/maintained/cairo-menu/applet.c
+++ applets/maintained/cairo-menu/applet.c	2012-01-15 03:33:27.069935343 +0100
@@ -21,7 +21,7 @@
 #include "cairo-menu-applet.h"
 
 #include <gtk/gtk.h>
-#include <glib/gi18n.h>
+#include <glib.h>
 
 extern void show_prefs (void);
 
Index: applets/maintained/cairo-menu/gnome-menu-builder.c
===================================================================
--- applets/maintained/cairo-menu/gnome-menu-builder.c
+++ applets/maintained/cairo-menu/gnome-menu-builder.c	2012-01-15 03:33:27.070935331 +0100
@@ -23,7 +23,7 @@
 
 #define GMENU_I_KNOW_THIS_IS_UNSTABLE
 #include <gnome-menus/gmenu-tree.h>
-#include <glib/gi18n.h>
+#include <glib.h>
 #include <libdesktop-agnostic/fdo.h>
 #include <gio/gio.h>
 
Index: applets/maintained/cairo-menu/misc.c
===================================================================
--- applets/maintained/cairo-menu/misc.c
+++ applets/maintained/cairo-menu/misc.c	2012-01-15 03:33:27.070935331 +0100
@@ -20,7 +20,7 @@
 #include "misc.h"
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-bindings.h>
-#include <glib/gi18n.h>
+#include <glib.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 #include <libdesktop-agnostic/vfs.h>
Index: applets/maintained/webapplet/applet.c
===================================================================
--- applets/maintained/webapplet/applet.c
+++ applets/maintained/webapplet/applet.c	2012-01-15 03:33:27.071935318 +0100
@@ -22,7 +22,6 @@
 #endif
 
 #include <glib.h>
-#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
Index: applets/maintained/notification-area/egg-tray-child.c
===================================================================
--- applets/maintained/notification-area/egg-tray-child.c
+++ applets/maintained/notification-area/egg-tray-child.c	2012-01-15 03:33:27.071935318 +0100
@@ -27,7 +27,7 @@
 
 #include "egg-tray-child.h"
 
-#include <glib/gi18n.h>
+#include <glib.h>
 #include <gdk/gdkx.h>
 #include <X11/Xatom.h>
 
Index: applets/maintained/notification-area/eggtraymanager.c
===================================================================
--- applets/maintained/notification-area/eggtraymanager.c
+++ applets/maintained/notification-area/eggtraymanager.c	2012-01-15 03:33:27.072935305 +0100
@@ -26,7 +26,7 @@
 #include "eggtraymanager.h"
 
 #include <gdkconfig.h>
-#include <glib/gi18n.h>
+#include <glib.h>
 #if defined (GDK_WINDOWING_X11)
 #include <gdk/gdkx.h>
 #include <X11/Xatom.h>
Index: applets/maintained/places/applet.c
===================================================================
--- applets/maintained/places/applet.c
+++ applets/maintained/places/applet.c	2012-01-15 03:33:27.072935305 +0100
@@ -24,8 +24,8 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <glib/gstdio.h>
-#include <glib/gi18n-lib.h>
+#include <glib.h>
+#include <glib.h>
 #include <string.h>
 
 #include <libdesktop-agnostic/ui.h>
Index: applets/maintained/awnterm/awn-terminal.c
===================================================================
--- applets/maintained/awnterm/awn-terminal.c
+++ applets/maintained/awnterm/awn-terminal.c	2012-01-15 03:33:27.074935279 +0100
@@ -34,11 +34,11 @@
 #include <math.h>
 #include <gdk/gdk.h>
 #include <vte/vte.h>
-#include <glib/gi18n-lib.h>
+#include <glib.h>
 #include <eggaccelerators.h>
 #include <gdk-pixbuf/gdk-pixdata.h>
 #include <keybinder.h>
-#include <glib/gi18n.h>
+#include <glib.h>
 #include <dbus/dbus.h>
 
 
Index: applets/maintained/awnterm/keybinder.h
===================================================================
--- applets/maintained/awnterm/keybinder.h
+++ applets/maintained/awnterm/keybinder.h	2012-01-15 03:33:27.075935266 +0100
@@ -24,7 +24,7 @@
 #ifndef __AWN_KEY_BINDER_H__
 #define __AWN_KEY_BINDER_H__
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 
Index: applets/unmaintained/awnsystemmonitor/awnsystemmonitor.h
===================================================================
--- applets/unmaintained/awnsystemmonitor/awnsystemmonitor.h
+++ applets/unmaintained/awnsystemmonitor/awnsystemmonitor.h	2012-01-15 03:33:27.075935266 +0100
@@ -25,7 +25,7 @@
 //#include <libawn/awn-title.h>
 #include <libawn/awn-tooltip.h>
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glibtop/cpu.h>
 #include <gconf/gconf-client.h>
 
Index: applets/unmaintained/awnsystemmonitor/awntop_cairo_component.c
===================================================================
--- applets/unmaintained/awnsystemmonitor/awntop_cairo_component.c
+++ applets/unmaintained/awnsystemmonitor/awntop_cairo_component.c	2012-01-15 03:33:27.075935266 +0100
@@ -43,8 +43,8 @@
 
 
 #include <libawn/awn-applet.h>
-#include <glib/gmacros.h>
-#include <glib/gerror.h>
+#include <glib.h>
+#include <glib.h>
 #include <gconf/gconf-value.h>
 
 #include <libawn/awn-dialog.h>
Index: applets/unmaintained/awnsystemmonitor/cpu_component.c
===================================================================
--- applets/unmaintained/awnsystemmonitor/cpu_component.c
+++ applets/unmaintained/awnsystemmonitor/cpu_component.c	2012-01-15 03:33:27.076935254 +0100
@@ -18,8 +18,8 @@
  */
 
 #include <libawn/awn-applet.h>
-#include <glib/gmacros.h>
-#include <glib/gerror.h>
+#include <glib.h>
+#include <glib.h>
 #include <gconf/gconf-value.h>
 
 #include <libawn/awn-dialog.h>
Index: applets/unmaintained/awnsystemmonitor/cpumetergconf.c
===================================================================
--- applets/unmaintained/awnsystemmonitor/cpumetergconf.c
+++ applets/unmaintained/awnsystemmonitor/cpumetergconf.c	2012-01-15 03:33:27.077935242 +0100
@@ -20,13 +20,13 @@
  * Boston, MA 02111-1307, USA.
  */
 #include <string.h>
-#include <glib/gmacros.h>
-#include <glib/gerror.h>
+#include <glib.h>
+#include <glib.h>
 #include <gconf/gconf-value.h>
 
 #include <libawn/awn-applet.h>
-#include <glib/gmacros.h>
-#include <glib/gerror.h>
+#include <glib.h>
+#include <glib.h>
 #include <gconf/gconf-value.h>
 
 #include "cairo-utils.h"
Index: applets/unmaintained/awnsystemmonitor/dashboard.h
===================================================================
--- applets/unmaintained/awnsystemmonitor/dashboard.h
+++ applets/unmaintained/awnsystemmonitor/dashboard.h	2012-01-15 03:33:27.077935242 +0100
@@ -23,8 +23,8 @@
 
 
 #include <libawn/awn-applet.h>
-#include <glib/gmacros.h>
-#include <glib/gerror.h>
+#include <glib.h>
+#include <glib.h>
 #include <gconf/gconf-value.h>
 
 #include <libawn/awn-dialog.h>
Index: applets/unmaintained/awnsystemmonitor/date_time_component.c
===================================================================
--- applets/unmaintained/awnsystemmonitor/date_time_component.c
+++ applets/unmaintained/awnsystemmonitor/date_time_component.c	2012-01-15 03:33:27.077935242 +0100
@@ -19,8 +19,8 @@
 
 
 #include <libawn/awn-applet.h>
-#include <glib/gmacros.h>
-#include <glib/gerror.h>
+#include <glib.h>
+#include <glib.h>
 #include <gconf/gconf-value.h>
 
 #include <libawn/awn-dialog.h>
Index: applets/unmaintained/awnsystemmonitor/loadavg_component.c
===================================================================
--- applets/unmaintained/awnsystemmonitor/loadavg_component.c
+++ applets/unmaintained/awnsystemmonitor/loadavg_component.c	2012-01-15 03:33:27.078935230 +0100
@@ -19,8 +19,8 @@
 
 #include <glibtop/loadavg.h>
 #include <libawn/awn-applet.h>
-#include <glib/gmacros.h>
-#include <glib/gerror.h>
+#include <glib.h>
+#include <glib.h>
 #include <gconf/gconf-value.h>
 
 #include <libawn/awn-dialog.h>
Index: applets/unmaintained/awnsystemmonitor/sysmem_component.c
===================================================================
--- applets/unmaintained/awnsystemmonitor/sysmem_component.c
+++ applets/unmaintained/awnsystemmonitor/sysmem_component.c	2012-01-15 03:33:27.078935230 +0100
@@ -19,8 +19,8 @@
 
 #include <glibtop/mem.h>
 #include <libawn/awn-applet.h>
-#include <glib/gmacros.h>
-#include <glib/gerror.h>
+#include <glib.h>
+#include <glib.h>
 #include <gconf/gconf-value.h>
 
 #include <libawn/awn-dialog.h>
Index: applets/unmaintained/awnsystemmonitor/uptime_component.c
===================================================================
--- applets/unmaintained/awnsystemmonitor/uptime_component.c
+++ applets/unmaintained/awnsystemmonitor/uptime_component.c	2012-01-15 03:33:27.078935230 +0100
@@ -1,7 +1,7 @@
 
 #include <libawn/awn-applet.h>
-#include <glib/gmacros.h>
-#include <glib/gerror.h>
+#include <glib.h>
+#include <glib.h>
 #include <gconf/gconf-value.h>
 
 #include <libawn/awn-dialog.h>
Index: applets/unmaintained/main-menu/applet.c
===================================================================
--- applets/unmaintained/main-menu/applet.c
+++ applets/unmaintained/main-menu/applet.c	2012-01-15 03:33:27.079935218 +0100
@@ -23,9 +23,9 @@
 
 #include <string.h>
 
-#include <glib/gmacros.h>
-#include <glib/gerror.h>
-#include <glib/gi18n.h>
+#include <glib.h>
+#include <glib.h>
+#include <glib.h>
 #include <gtk/gtk.h>
 #include <libdesktop-agnostic/fdo.h>
 #include <libawn/libawn.h>
Index: shared/vala/libintl.vapi
===================================================================
--- shared/vala/libintl.vapi
+++ shared/vala/libintl.vapi	2012-01-15 03:33:27.079935218 +0100
@@ -1,4 +1,4 @@
-[CCode (cheader_filename = "glib.h,glib/gi18n.h", cprefix = "", lower_case_cprefix = "")]
+[CCode (cheader_filename = "glib.h", cprefix = "", lower_case_cprefix = "")]
 namespace GLib.Gettext {
 	public static unowned string _ (string msgid);
 	public static unowned string ngettext (string msgid, string msgid_plural, ulong n);