[Xfce4-commits] [panel-plugins/xfce4-notes-plugin] 01/01: vala: Fix compilation errors, and fix build for GTK2 and GTK3 to work together

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

mmassonnet pushed a commit to branch master
in repository panel-plugins/xfce4-notes-plugin.

commit 03b6e5f528a1a6c5872a3cfb403f98e96f772bfe
Author: Mike Massonnet <mmassonnet at gmail.com>
Date:   Fri Mar 27 19:59:10 2015 +0100

    vala: Fix compilation errors, and fix build for GTK2 and GTK3 to work together
---
 lib/theme-gtkcss.vala |    3 +++
 lib/theme-gtkrc.c     |    8 ++++----
 lib/theme-gtkrc.vapi  |    2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/theme-gtkcss.vala b/lib/theme-gtkcss.vala
index dc72317..becd371 100644
--- a/lib/theme-gtkcss.vala
+++ b/lib/theme-gtkcss.vala
@@ -17,6 +17,7 @@
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#if ENABLE_GTK3
 namespace Xnp {
 
 	public class ThemeGtkcss : GLib.Object {
@@ -48,3 +49,5 @@ namespace Xnp {
 	}
 
 }
+#endif
+
diff --git a/lib/theme-gtkrc.c b/lib/theme-gtkrc.c
index 5a45237..c7aef8f 100644
--- a/lib/theme-gtkrc.c
+++ b/lib/theme-gtkrc.c
@@ -41,7 +41,7 @@
 
 
 void
-update_gtkrc (const GdkColor color)
+update_gtkrc (const GdkColor *color)
 {
   GdkColor *color2;
   gchar *notesrc_file;
@@ -52,16 +52,16 @@ update_gtkrc (const GdkColor color)
   gchar *offset;
 
   /* bg */
-  bg = gdk_color_to_string (&color);
+  bg = gdk_color_to_string (color);
 
   /* text */
-  color2 = gdk_color_copy (&color);
+  color2 = gdk_color_copy (color);
   __gdk_color_contrast (color2, 5.);
   text = gdk_color_to_string (color2);
   gdk_color_free (color2);
 
   /* selected */
-  color2 = gdk_color_copy (&color);
+  color2 = gdk_color_copy (color);
   __gdk_color_contrast (color2, 3.2);
   selected = gdk_color_to_string (color2);
   gdk_color_free (color2);
diff --git a/lib/theme-gtkrc.vapi b/lib/theme-gtkrc.vapi
index 606ab96..5405c17 100644
--- a/lib/theme-gtkrc.vapi
+++ b/lib/theme-gtkrc.vapi
@@ -1,6 +1,6 @@
-[CCode (cprefix = "", lower_case_prefix = "", cheader_filename = "theme-gtkrc.h")]
 namespace Xnp {
 	public class ThemeGtkrc {
+		[CCode (cname = "update_gtkrc", cheader_filename = "theme-gtkrc.h")]
 		public static void update_gtkrc (Gdk.Color color);
 	}
 }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.