Revision: 2187
http://geany.svn.sourceforge.net/geany/?rev=2187&view=rev
Author: eht16
Date: 2008-01-23 06:32:52 -0800 (Wed, 23 Jan 2008)
Log Message:
-----------
Don't include utils.h to avoid the need to include geany.h for GTK 2.6 compatibility defintion of G_GNUC_NULL_TERMINATED.
Modified Paths:
--------------
trunk/src/geanywraplabel.c
Modified: trunk/src/geanywraplabel.c
===================================================================
--- trunk/src/geanywraplabel.c 2008-01-23 14:12:08 UTC (rev 2186)
+++ trunk/src/geanywraplabel.c 2008-01-23 14:32:52 UTC (rev 2187)
@@ -29,7 +29,6 @@
#include <gtk/gtklabel.h>
#include "geanywraplabel.h"
-#include "utils.h"
/* Local data */
@@ -186,7 +185,7 @@
{
GtkWidget *l = g_object_new(GEANY_WRAP_LABEL_TYPE, NULL);
- if (NZV(text))
+ if (text != NULL && text[0] != '\0')
gtk_label_set_text(GTK_LABEL(l), text);
pango_layout_set_wrap(gtk_label_get_layout(GTK_LABEL(l)), PANGO_WRAP_WORD_CHAR);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 2185
http://geany.svn.sourceforge.net/geany/?rev=2185&view=rev
Author: eht16
Date: 2008-01-23 05:36:53 -0800 (Wed, 23 Jan 2008)
Log Message:
-----------
Fix wrong placement of descriptive texts in Templates and Tools tabs in the preferences dialog.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/prefs.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-01-23 13:35:08 UTC (rev 2184)
+++ trunk/ChangeLog 2008-01-23 13:36:53 UTC (rev 2185)
@@ -4,6 +4,8 @@
Move class and label structs to geanywraplabel.c.
Override widget functions instead of using event handlers
(trying to fix #1869399).
+ * src/prefs.c: Fix wrong placement of descriptive texts in Templates
+ and Tools tabs in the preferences dialog.
2008-01-22 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
Modified: trunk/src/prefs.c
===================================================================
--- trunk/src/prefs.c 2008-01-23 13:35:08 UTC (rev 2184)
+++ trunk/src/prefs.c 2008-01-23 13:36:53 UTC (rev 2185)
@@ -1342,12 +1342,12 @@
// page Tools
label = geany_wrap_label_new(_("Enter tool paths below. Tools you do not need can be left blank."));
gtk_widget_show(label);
- gtk_box_pack_start(GTK_BOX(lookup_widget(ui_widgets.prefs_dialog, "vbox31")),
+ gtk_box_pack_start(GTK_BOX(lookup_widget(ui_widgets.prefs_dialog, "vbox33")),
label, FALSE, TRUE, 5);
// page Templates
label = geany_wrap_label_new(_("Set the information to be used in templates. See the documentation for details."));
gtk_widget_show(label);
- gtk_box_pack_start(GTK_BOX(lookup_widget(ui_widgets.prefs_dialog, "vbox33")),
+ gtk_box_pack_start(GTK_BOX(lookup_widget(ui_widgets.prefs_dialog, "vbox31")),
label, FALSE, TRUE, 5);
label = geany_wrap_label_new(_("<i>Notice: For all changes you make here to take effect, you need to restart Geany.</i>"));
gtk_widget_show(label);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.