Author: juha
Date: 2008-08-22 20:27:16 +0000 (Fri, 22 Aug 2008)
New Revision: 27541
Modified:
xfcalendar/trunk/globaltime/gt_parfile.c
xfcalendar/trunk/panel-plugin/orageclock.c
xfcalendar/trunk/src/appointment.c
xfcalendar/trunk/src/functions.c
xfcalendar/trunk/tz_convert/tz_convert.c
Log:
more --enable-debug=full fixes with newer gcc
Modified: xfcalendar/trunk/globaltime/gt_parfile.c
===================================================================
--- xfcalendar/trunk/globaltime/gt_parfile.c 2008-08-22 12:43:05 UTC (rev
27540)
+++ xfcalendar/trunk/globaltime/gt_parfile.c 2008-08-22 20:27:16 UTC (rev
27541)
@@ -18,6 +18,7 @@
#include <stdlib.h>
#include <stdio.h>
+#include <unistd.h>
#include <string.h>
#include <time.h>
#include <glib.h>
@@ -106,7 +107,6 @@
static gboolean read_string(XfceRc *rc, gchar *prop, GString *result)
{
- gchar *tmp;
gboolean found = FALSE;
if (xfce_rc_has_entry(rc, prop)) {
@@ -120,11 +120,18 @@
{
gchar *tmp;
gboolean found = FALSE;
+ unsigned int red, green, blue;
if (xfce_rc_has_entry(rc, prop)) {
tmp = (gchar *)xfce_rc_read_entry(rc, prop, "");
+ /*
sscanf(tmp, "%uR %uG %uB", &(*result)->red, &(*result)->green
, &(*result)->blue);
+ */
+ sscanf(tmp, "%uR %uG %uB", &red, &green, &blue);
+ (*result)->red = red;
+ (*result)->green = green;
+ (*result)->blue = blue;
(*result)->pixel = 0;
found = TRUE;
}
@@ -133,9 +140,6 @@
static void read_attr(XfceRc *rc, text_attr_struct *attr)
{
- gchar *tmp;
-
-
attr->clock_fg_modified = read_color(rc, "fg", &attr->clock_fg);
attr->clock_bg_modified = read_color(rc, "bg", &attr->clock_bg);
attr->name_font_modified =
Modified: xfcalendar/trunk/panel-plugin/orageclock.c
===================================================================
--- xfcalendar/trunk/panel-plugin/orageclock.c 2008-08-22 12:43:05 UTC (rev
27540)
+++ xfcalendar/trunk/panel-plugin/orageclock.c 2008-08-22 20:27:16 UTC (rev
27541)
@@ -434,6 +434,7 @@
const gchar *ret;
gchar tmp[100];
gint i;
+ unsigned int red, green, blue;
if (!(file = xfce_panel_plugin_lookup_rc_file(plugin)))
return; /* if it does not exist, we use defaults from orage_oc_new */
@@ -448,20 +449,32 @@
clock->fg_set = xfce_rc_read_bool_entry(rc, "fg_set", FALSE);
if (clock->fg_set) {
ret = xfce_rc_read_entry(rc, "fg", NULL);
+ /*
sscanf(ret, "%uR %uG %uB"
, (unsigned int *)&clock->fg.red
, (unsigned int *)&clock->fg.green
, (unsigned int *)&clock->fg.blue);
+ */
+ sscanf(ret, "%uR %uG %uB", &red, &green, &blue);
+ clock->fg.red = red;
+ clock->fg.green = green;
+ clock->fg.blue = blue;
clock->fg.pixel = 0;
}
clock->bg_set = xfce_rc_read_bool_entry(rc, "bg_set", FALSE);
if (clock->bg_set) {
ret = xfce_rc_read_entry(rc, "bg", NULL);
+ /*
sscanf(ret, "%uR %uG %uB"
, (unsigned int *)&clock->bg.red
, (unsigned int *)&clock->bg.green
, (unsigned int *)&clock->bg.blue);
+ */
+ sscanf(ret, "%uR %uG %uB", &red, &green, &blue);
+ clock->fg.red = red;
+ clock->fg.green = green;
+ clock->fg.blue = blue;
clock->bg.pixel = 0;
}
Modified: xfcalendar/trunk/src/appointment.c
===================================================================
--- xfcalendar/trunk/src/appointment.c 2008-08-22 12:43:05 UTC (rev 27540)
+++ xfcalendar/trunk/src/appointment.c 2008-08-22 20:27:16 UTC (rev 27541)
@@ -1502,6 +1502,7 @@
gint i;
orage_category_struct *cat;
GdkColormap *pic1_cmap;
+ unsigned int red, green, blue;
if (orage_category_list != NULL)
orage_category_free_list();
@@ -1514,10 +1515,16 @@
if (color) {
cat = g_new(orage_category_struct, 1);
cat->category = g_strdup(cat_groups[i]);
+ /*
sscanf(color, ORAGE_COLOR_FORMAT
, (unsigned int *)&(cat->color.red)
, (unsigned int *)&(cat->color.green)
, (unsigned int *)&(cat->color.blue));
+ */
+ sscanf(color, ORAGE_COLOR_FORMAT, &red, &green, &blue);
+ cat->color.red = red;
+ cat->color.green = green;
+ cat->color.blue = blue;
gdk_colormap_alloc_color(pic1_cmap, &cat->color, FALSE, TRUE);
orage_category_list = g_list_prepend(orage_category_list, cat);
g_free(color);
Modified: xfcalendar/trunk/src/functions.c
===================================================================
--- xfcalendar/trunk/src/functions.c 2008-08-22 12:43:05 UTC (rev 27540)
+++ xfcalendar/trunk/src/functions.c 2008-08-22 20:27:16 UTC (rev 27541)
@@ -83,7 +83,7 @@
void orage_message(gint level, const char *format, ...)
{
va_list args;
- char *formatted, *str;
+ char *formatted;
if (level < g_par.log_level)
return;
@@ -361,7 +361,9 @@
struct tm orage_icaltime_to_tm_time(const char *icaltime, gboolean real_tm)
{
+ /*
int i;
+ */
struct tm t = {0,0,0,0,0,0,0,0,0};
char *ret;
Modified: xfcalendar/trunk/tz_convert/tz_convert.c
===================================================================
--- xfcalendar/trunk/tz_convert/tz_convert.c 2008-08-22 12:43:05 UTC (rev
27540)
+++ xfcalendar/trunk/tz_convert/tz_convert.c 2008-08-22 20:27:16 UTC (rev
27541)
@@ -22,6 +22,9 @@
#include <libgen.h>
/* dirname, basename */
+/* This define is needed to get nftw instead if ftw.
+ * Documentation says the define is _XOPEN_SOURCE, but it
+ * does not work. __USE_XOPEN_EXTENDED works */
#define _XOPEN_SOURCE 500
#define __USE_XOPEN_EXTENDED 1
#include <ftw.h>
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
