Revision: 583 Author: eht16 Date: 2006-07-18 15:01:24 -0700 (Tue, 18 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=583&view=rev
Log Message: ----------- Compile notebook_motion_notify_event_cb() only with GTK 2.6 (again). Made "built on" string translatable.
Modified Paths: -------------- trunk/ChangeLog trunk/src/about.c trunk/src/notebook.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-07-18 17:43:22 UTC (rev 582) +++ trunk/ChangeLog 2006-07-18 22:01:24 UTC (rev 583) @@ -1,3 +1,10 @@ +2006-07-18 Enrico Troeger enrico.troeger@uvena.de + + * src/notebook.c: + Compile notebook_motion_notify_event_cb() only with GTK 2.6 (again). + * src/about.c: Made "built on" string translatable. + + 2006-07-18 Nick Treleaven nick.treleaven@btinternet.com
* src/sciwrappers.c, src/sciwrappers.h, src/document.c:
Modified: trunk/src/about.c =================================================================== --- trunk/src/about.c 2006-07-18 17:43:22 UTC (rev 582) +++ trunk/src/about.c 2006-07-18 22:01:24 UTC (rev 583) @@ -32,7 +32,7 @@ #define HEADER "<span size="larger" weight="bold">Geany " VERSION "%s</span>" #define INFO "<span size="larger" weight="bold">%s</span>" #define CODENAME "<span weight="bold">"" GEANY_CODENAME ""</span>" -#define BUILDDATE "<span size="smaller">(built on " __DATE__ ")</span>" +#define BUILDDATE "<span size="smaller">%s</span>" #define COPYRIGHT "Copyright (c) 2005-2006 \n Enrico Tröger \nAll rights reserved." #define CREDITS \ "<span size="larger" weight="bold">%s</span>\n\t\ @@ -89,6 +89,7 @@ GtkTextBuffer* tb; gchar *license_text = NULL; gchar buffer[512]; + gchar buffer2[128]; gchar *credits;
dialog = gtk_dialog_new(); @@ -165,7 +166,9 @@ gtk_label_set_justify(GTK_LABEL(builddate_label), GTK_JUSTIFY_CENTER); gtk_label_set_selectable(GTK_LABEL(builddate_label), TRUE); gtk_label_set_use_markup(GTK_LABEL(builddate_label), TRUE); - gtk_label_set_markup(GTK_LABEL(builddate_label), BUILDDATE); + g_snprintf(buffer2, sizeof(buffer2), _("(built on %s)"), __DATE__); + g_snprintf(buffer, sizeof(buffer), BUILDDATE, buffer2); + gtk_label_set_markup(GTK_LABEL(builddate_label), buffer); gtk_misc_set_padding(GTK_MISC(builddate_label), 2, 2); gtk_widget_show(builddate_label); gtk_box_pack_start(GTK_BOX(info_box), builddate_label, FALSE, FALSE, 0);
Modified: trunk/src/notebook.c =================================================================== --- trunk/src/notebook.c 2006-07-18 17:43:22 UTC (rev 582) +++ trunk/src/notebook.c 2006-07-18 22:01:24 UTC (rev 583) @@ -37,9 +37,11 @@ notebook_drag_motion_cb(GtkWidget *widget, GdkDragContext *dc, gint x, gint y, guint time, gpointer user_data);
+#if ! GTK_CHECK_VERSION(2, 8, 0) static gboolean notebook_motion_notify_event_cb(GtkWidget *widget, GdkEventMotion *event, gpointer user_data); +#endif
static gint notebook_find_tab_num_at_pos(GtkNotebook *notebook, gint x, gint y);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.