From: Andrea Zagli Date: Sun, 27 Jun 2010 07:55:49 +0000 (+0200) Subject: Started glade integration. X-Git-Tag: 0.0.3~9 X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=032d1548631c5066766dd05d26a60346a77c49a8;p=libgtkdateentry Started glade integration. --- diff --git a/configure.ac b/configure.ac index 53cae48..6299df3 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.59) -AC_INIT([GtkDateEntry], [0.0.2], [azagli@inwind.it]) +AC_INIT([GtkDateEntry], [0.0.3], [azagli@libero.it]) AC_CONFIG_SRCDIR([src/gtkdateentry.c]) AC_CONFIG_HEADER([config.h]) @@ -31,6 +31,7 @@ GTK_DOC_CHECK(1.0) PKG_CHECK_MODULES(GTKDATEENTRY, [gtk+-2.0 >= 2.6.8 libgtkmaskedentry >= 0.0.1]) +PKG_CHECK_EXISTS(gladeui-1.0 >= 3.2.0, [GLADEUI_FOUND=yes], [GLADEUI_FOUND=no]) AC_SUBST(GTKDATEENTRY_CFLAGS) AC_SUBST(GTKDATEENTRY_LIBS) @@ -45,4 +46,14 @@ AC_CONFIG_FILES([ docs/reference/Makefile docs/reference/version.xml ]) + +if test $GLADEUI_FOUND = yes; then +AC_CONFIG_FILES([ + glade/Makefile + glade/icons/Makefile + glade/icons/16x16/Makefile + glade/icons/22x22/Makefile +]) +fi + AC_OUTPUT diff --git a/src/gtkdateentry.c b/src/gtkdateentry.c index 45baf05..3f03f7f 100644 --- a/src/gtkdateentry.c +++ b/src/gtkdateentry.c @@ -1,7 +1,7 @@ /* * GtkDateEntry widget for GTK+ * - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2010 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -272,7 +272,7 @@ gtk_date_entry_set_format (GtkDateEntry *date, const gchar *format) gdate = gtk_date_entry_get_gdate (date); - priv->format = g_strdup (format); + priv->format = g_strdup (format); gtk_date_entry_change_mask (date); gtk_date_entry_set_date_gdate (date, gdate); @@ -292,7 +292,7 @@ const gchar { GtkDateEntryPrivate *priv = GTK_DATE_ENTRY_GET_PRIVATE (date); - return gtk_entry_get_text (GTK_ENTRY (priv->day)); + return gtk_entry_get_text (GTK_ENTRY (priv->day)); } /** @@ -819,7 +819,7 @@ btnCalendar_on_toggled (GtkToggleButton *togglebutton, gtk_grab_add (wCalendar); gtk_window_move (GTK_WINDOW (wCalendar), x, y); - gtk_widget_show (wCalendar); + gtk_widget_show (wCalendar); gtk_widget_grab_focus (priv->calendar); popup_grab_on_window (wCalendar->window, gtk_get_current_event_time ()); } diff --git a/src/gtkdateentry.h b/src/gtkdateentry.h index 7c0d83d..ec0a401 100644 --- a/src/gtkdateentry.h +++ b/src/gtkdateentry.h @@ -1,7 +1,7 @@ /* * GtkDateEntry widget for GTK+ * - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2010 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public