[Goodies-commits] r7390 - in xfce4-notes-plugin/trunk: . panel-plugin

[Mike Massonnet]

Author: mmassonnet
Date: 2009-05-22 08:42:27 +0000 (Fri, 22 May 2009)
New Revision: 7390

Modified:
   xfce4-notes-plugin/trunk/ChangeLog
   xfce4-notes-plugin/trunk/panel-plugin/Makefile.am
   xfce4-notes-plugin/trunk/panel-plugin/notes.c
Log:
Update automake script for Vala 0.7

Modified: xfce4-notes-plugin/trunk/ChangeLog
===================================================================
--- xfce4-notes-plugin/trunk/ChangeLog	2009-05-21 14:33:05 UTC (rev 7389)
+++ xfce4-notes-plugin/trunk/ChangeLog	2009-05-22 08:42:27 UTC (rev 7390)
@@ -1,3 +1,12 @@
+2009-05-22  Mike Massonnet <mmassonnet at xfce.org>
+
+Update automake script for Vala 0.7
+	* panel-plugin/Makefile.am:
+	  - Need to pass a -H parameter to output a unique header file that
+	  can be used in the different C sources
+	* panel-plugin/notes.c:
+	  - Use new namespace for the hypertextview (s/XFCE/XNP/)
+
 2009-05-20  Mike Massonnet <mmassonnet at xfce.org>
 
 Display existing notes in the menu Go

Modified: xfce4-notes-plugin/trunk/panel-plugin/Makefile.am
===================================================================
--- xfce4-notes-plugin/trunk/panel-plugin/Makefile.am	2009-05-21 14:33:05 UTC (rev 7389)
+++ xfce4-notes-plugin/trunk/panel-plugin/Makefile.am	2009-05-22 08:42:27 UTC (rev 7390)
@@ -29,7 +29,7 @@
 
 BUILT_SOURCES = vala.stamp
 vala.stamp: $(xfce4_notes_plugin_VALASOURCES)
-	$(VALAC) --pkg=gtk+-2.0 $^ -C
+	$(VALAC) --pkg=gtk+-2.0 $^ -C -H vala-objects.h
 	touch $@
 endif
 

Modified: xfce4-notes-plugin/trunk/panel-plugin/notes.c
===================================================================
--- xfce4-notes-plugin/trunk/panel-plugin/notes.c	2009-05-21 14:33:05 UTC (rev 7389)
+++ xfce4-notes-plugin/trunk/panel-plugin/notes.c	2009-05-22 08:42:27 UTC (rev 7390)
@@ -36,7 +36,7 @@
 #include "defines.h"
 #include "notes.h"
 #include "xfce-arrow-button.h"
-#include "hypertextview.h"
+#include "vala-objects.h"
 
 #define PLUGIN_NAME "xfce4-notes-plugin"
 #define OPAQUE 0xffffffff
@@ -1649,7 +1649,7 @@
 notes_window_undo (NotesWindow *notes_window)
 {
   NotesNote *current_note = notes_window_get_current_note (notes_window);
-  xfce_hypertext_view_undo (XFCE_HYPERTEXT_VIEW (current_note->text_view));
+  xnp_hypertext_view_undo (XNP_HYPERTEXT_VIEW (current_note->text_view));
 }
 
 
@@ -1727,7 +1727,7 @@
                                   GTK_POLICY_AUTOMATIC);
 
   /* Text view */
-  notes_note->text_view = (GtkWidget *)xfce_hypertext_view_new ();
+  notes_note->text_view = (GtkWidget *)xnp_hypertext_view_new ();
   g_object_set (notes_note->text_view,
                 "wrap-mode", GTK_WRAP_WORD,
                 "left-margin", 2,