[maemo-commits] [maemo-commits] r16721 - projects/haf/trunk/hildon-help/src
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Tue Nov 18 13:00:13 EET 2008
- Previous message: [maemo-commits] r16720 - in projects/haf/trunk/hildon-thumbnail: . daemon daemon/plugins
- Next message: [maemo-commits] r16722 - projects/haf/trunk/hildon-thumbnail/daemon/plugins
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: schulhof
Date: 2008-11-18 13:00:12 +0200 (Tue, 18 Nov 2008)
New Revision: 16721
Modified:
projects/haf/trunk/hildon-help/src/browser.c
projects/haf/trunk/hildon-help/src/contents.c
projects/haf/trunk/hildon-help/src/context.c
projects/haf/trunk/hildon-help/src/filter.c
projects/haf/trunk/hildon-help/src/graphic.c
projects/haf/trunk/hildon-help/src/osso-helplib.c
Log:
Making it build
Modified: projects/haf/trunk/hildon-help/src/browser.c
===================================================================
--- projects/haf/trunk/hildon-help/src/browser.c 2008-11-18 10:54:31 UTC (rev 16720)
+++ projects/haf/trunk/hildon-help/src/browser.c 2008-11-18 11:00:12 UTC (rev 16721)
@@ -262,7 +262,7 @@
*/
gboolean browser_has_selection( GtkWidget *browser, gboolean *retval_ref )
{
- guint len = G_MAXUINT;
+ gint len = G_MAXINT;
if (gtk_html_command(GTK_HTML(gtk_bin_get_child(GTK_BIN(browser))),
"is-selection-active"))
{
Modified: projects/haf/trunk/hildon-help/src/contents.c
===================================================================
--- projects/haf/trunk/hildon-help/src/contents.c 2008-11-18 10:54:31 UTC (rev 16720)
+++ projects/haf/trunk/hildon-help/src/contents.c 2008-11-18 11:00:12 UTC (rev 16721)
@@ -132,7 +132,7 @@
return;
}
- if (strcmp(name,"ossohelpsource")==0) {
+ if (strcmp((const char *)name,"ossohelpsource")==0) {
g_assert( !d.inside );
d.inside= TRUE;
@@ -150,7 +150,7 @@
if (!d.inside) return; /* not met 'ossohelpsource' yet */
if (d.listing_depth == d.folder_depth) {
- if (strcmp(name,"topic")==0) {
+ if (strcmp((const char *)name,"topic")==0) {
d.topics_met++;
@@ -159,15 +159,15 @@
filter_startElement_cb( data, name, attrs ); /* pass on <topic> */
return;
}
- } else if (strcmp(name,"folder")==0) {
+ } else if (strcmp((const char *)name,"folder")==0) {
d.folders_met++;
} else if (d.mode==MODE_TITLEHUNT) {
- if ((strcmp(name,"title")==0) && (d.topic_number==0)) {
+ if ((strcmp((const char *)name,"title")==0) && (d.topic_number==0)) {
/* hunt current folder's title? (hey, we're there!) */
d.titlehunt_active= TRUE; /* catch any characters until '</title>' */
- } else if ((strcmp(name,"topictitle")==0) &&
+ } else if ((strcmp((const char *)name,"topictitle")==0) &&
(d.topic_number==d.topics_met)) {
d.titlehunt_active= TRUE; /* catch any characters until '</topictitle>' */
}
@@ -175,7 +175,7 @@
}
}
- if (strcmp(name,"folder")==0) {
+ if (strcmp((const char *)name,"folder")==0) {
d.folder_depth++;
if ( d.folder_depth == d.active_depth) {
d.folders_until_mom--;
@@ -216,7 +216,7 @@
/* let also </topic> pass on */
filter_endElement_cb( data, name );
- if (strcmp(name,"topic")==0) {
+ if (strcmp((const char *)name,"topic")==0) {
d.filter_active= FALSE;
d.inside= FALSE; /* ignore all the rest (could we jump out?) */
}
@@ -224,7 +224,7 @@
return;
}
- if (strcmp(name,"ossohelpsource")==0) {
+ if (strcmp((const char *)name,"ossohelpsource")==0) {
/* If still active, did not find the folder. */
d.inside= FALSE;
return;
@@ -232,7 +232,7 @@
if (!d.inside) return;
- if (strcmp(name,"folder")==0) {
+ if (strcmp((const char *)name,"folder")==0) {
if (d.listing_depth == d.folder_depth)
d.inside= FALSE; /* end of our work (could we just jump off?) */
else
@@ -242,7 +242,7 @@
}
if (d.titlehunt_active &&
- ((strcmp(name,"title")==0) || (strcmp(name,"topictitle")==0))) {
+ ((strcmp((const char *)name,"title")==0) || (strcmp((const char *)name,"topictitle")==0))) {
d.inside= FALSE; /* ignore all the rest (could we jump out?) */
return;
}
Modified: projects/haf/trunk/hildon-help/src/context.c
===================================================================
--- projects/haf/trunk/hildon-help/src/context.c 2008-11-18 10:54:31 UTC (rev 16720)
+++ projects/haf/trunk/hildon-help/src/context.c 2008-11-18 11:00:12 UTC (rev 16721)
@@ -51,7 +51,7 @@
if (matched) return;
- if (strcmp(name,"context")==0) {
+ if (strcmp((const char *)name,"context")==0) {
const char *uid= (const char*)loc_getattr( attrs, "contextUID" );
if (!uid) {
@@ -65,7 +65,7 @@
}
}
- if (strcmp(name,"folder")==0) {
+ if (strcmp((const char *)name,"folder")==0) {
/* First folder, 'trace'=="", 'current_depth'==0 */
g_assert( current_depth < sizeof(trace)-2 );
@@ -78,7 +78,7 @@
trace[current_depth]= '\0';
}
- if (strcmp(name,"topic")==0)
+ if (strcmp((const char *)name,"topic")==0)
topic_count++;
}
@@ -89,7 +89,7 @@
if (matched) return;
- if (strcmp(name,"folder")==0) {
+ if (strcmp((const char *)name,"folder")==0) {
g_assert( current_depth >= 1 );
current_depth--;
Modified: projects/haf/trunk/hildon-help/src/filter.c
===================================================================
--- projects/haf/trunk/hildon-help/src/filter.c 2008-11-18 10:54:31 UTC (rev 16720)
+++ projects/haf/trunk/hildon-help/src/filter.c 2008-11-18 11:00:12 UTC (rev 16721)
@@ -261,7 +261,7 @@
if (attrs && name) {
for( n=0; attrs[n*2]; n++ ) {
- if ( strcmp(attrs[n*2],name)==0 )
+ if ( strcmp((const char *)attrs[n*2],name)==0 )
return (const char *)attrs[n*2+1];
}
}
@@ -315,7 +315,7 @@
}
/* Tags to be ignored: */
- if ( (strcmp(name,"comment")==0) ) {
+ if ( (strcmp((const char *)name,"comment")==0) ) {
StartUnknown:
unknown_depth++; /* this will shut up about the contents */
return ""; /* just ignore :) */
@@ -331,7 +331,7 @@
this wouldn't harm anyway.
*/
- if (strcmp(name,"seealso")==0) {
+ if (strcmp((const char *)name,"seealso")==0) {
snprintf( buf, sizeof(buf), "%s%s%s",
EMPHASIS_BOLD_START,
helplib_ui_str(HELP_UI_IA_SEE_ALSO),
@@ -340,74 +340,74 @@
}
/* State independent tags (text style etc.): */
- if ( (strcmp(name,"b")==0) ||
- (strcmp(name,"i")==0) ||
- (strcmp(name,"sup")==0) ||
- (strcmp(name,"sub")==0) ) {
+ if ( (strcmp((const char *)name,"b")==0) ||
+ (strcmp((const char *)name,"i")==0) ||
+ (strcmp((const char *)name,"sup")==0) ||
+ (strcmp((const char *)name,"sub")==0) ) {
return "<%s>"; /* pass-through to HTML */
}
#ifdef USE_CSS /* CSS2 implementation */
- if ( strcmp(name,"para")==0 )
+ if ( strcmp((const char *)name,"para")==0 )
return TAG_BODY_TEXT_START;
- if ( strcmp(name,"heading")==0 )
+ if ( strcmp((const char *)name,"heading")==0 )
return TAG_SUBHEADING_START;
- if ( strcmp(name,"ldquote")==0 ) return "&8220;";
- if ( strcmp(name,"rdquote")==0 ) return "&8221;";
- if ( strcmp(name,"lquote")==0 ) return "&8216;";
- if ( strcmp(name,"rquote")==0 ) return "&8217;";
- if ( strcmp(name,"mdash")==0 ) return "&8212;";
- if ( strcmp(name,"ndash")==0 ) return "&8211;";
- if ( strcmp(name,"break")==0 ) return "&8232;";
- if ( strcmp(name,"nbhyphen")==0 ) return "&8208;";
- if ( strcmp(name,"nbspace")==0 ) return "&160;";
- if ( strcmp(name,"tab")==0 ) return "&160;&160;&160;";
+ if ( strcmp((const char *)name,"ldquote")==0 ) return "&8220;";
+ if ( strcmp((const char *)name,"rdquote")==0 ) return "&8221;";
+ if ( strcmp((const char *)name,"lquote")==0 ) return "&8216;";
+ if ( strcmp((const char *)name,"rquote")==0 ) return "&8217;";
+ if ( strcmp((const char *)name,"mdash")==0 ) return "&8212;";
+ if ( strcmp((const char *)name,"ndash")==0 ) return "&8211;";
+ if ( strcmp((const char *)name,"break")==0 ) return "&8232;";
+ if ( strcmp((const char *)name,"nbhyphen")==0 ) return "&8208;";
+ if ( strcmp((const char *)name,"nbspace")==0 ) return "&160;";
+ if ( strcmp((const char *)name,"tab")==0 ) return "&160;&160;&160;";
- if ( strcmp(name,"display_text")==0 ) {
+ if ( strcmp((const char *)name,"display_text")==0 ) {
return TAG_DISPLAY_TEXT_START;
}
- if ( strcmp(name,"tip")==0 ) {
+ if ( strcmp((const char *)name,"tip")==0 ) {
sprintf(buf, TAG_TIP_START, helplib_ui_str(HELP_UI_TAG_TIP));
return buf;
}
- if ( strcmp(name,"note")==0 ) {
+ if ( strcmp((const char *)name,"note")==0 ) {
sprintf(buf, TAG_NOTE_START, helplib_ui_str(HELP_UI_TAG_NOTE));
return buf;
}
- if ( strcmp(name,"example")==0 ) {
+ if ( strcmp((const char *)name,"example")==0 ) {
sprintf(buf, TAG_EXAMPLE_START, helplib_ui_str(HELP_UI_TAG_EXAMPLE));
return buf;
}
- if ( strcmp(name,"warning")==0 ) {
+ if ( strcmp((const char *)name,"warning")==0 ) {
sprintf(buf, TAG_WARNING_START, helplib_ui_str(HELP_UI_TAG_WARNING));
return buf;
}
- if ( strcmp(name,"important")==0 ) {
+ if ( strcmp((const char *)name,"important")==0 ) {
sprintf(buf, TAG_IMPORTANT_START, helplib_ui_str(HELP_UI_TAG_IMPORTANT));
return buf;
}
- if ( strcmp(name,"menu_seq")==0 )
+ if ( strcmp((const char *)name,"menu_seq")==0 )
return TAG_MENU_SEQUENCE_START;
- if ( strcmp(name,"task_seq")==0 )
+ if ( strcmp((const char *)name,"task_seq")==0 )
return TAG_TASK_SEQUENCE_START;
- if ( strcmp(name,"step")==0 )
+ if ( strcmp((const char *)name,"step")==0 )
return TAG_TASK_SEQUENCE_STEP_START;
- if ( strcmp(name,"main_method")==0 )
+ if ( strcmp((const char *)name,"main_method")==0 )
return "";
- if ( strcmp(name,"emphasis")==0 ) {
+ if ( strcmp((const char *)name,"emphasis")==0 ) {
const char *role= loc_getattr( attrs, "role" );
if (!role) role= "";
@@ -417,100 +417,100 @@
return buf;
}
- if ( strcmp(name,"topic")==0 )
+ if ( strcmp((const char *)name,"topic")==0 )
return "";
- if ( strcmp(name,"topictitle")==0 ) {
+ if ( strcmp((const char *)name,"topictitle")==0 ) {
if (dialog_mode)
goto StartUnknown; /* ignore title text completely */
return TAG_TOPIC_TITLE_START;
}
- if ( strcmp(name,"list")==0 ) {
+ if ( strcmp((const char *)name,"list")==0 ) {
const char *s= loc_getattr( attrs, "style" );
if (!s) s="";
- if ( strcmp(s,"bullet")!=0 )
+ if ( strcmp((const char *)s,"bullet")!=0 )
ULOG_WARN( "Unknown <list> style: '%s'", s );
return TAG_BULLET_LIST_START;
}
- if ( strcmp(name,"listitem")==0 )
+ if ( strcmp((const char *)name,"listitem")==0 )
return TAG_BULLET_LIST_ITEM_START;
#else /* Old implementation without CSS */
- if ( strcmp(name,"para")==0 )
+ if ( strcmp((const char *)name,"para")==0 )
return PARA_START; /*"<p>";*/
- if ( strcmp(name,"heading")==0 )
+ if ( strcmp((const char *)name,"heading")==0 )
return HEADING_START; /*"<hX>";*/
- if ( strcmp(name,"ldquote")==0 ) return "&8220;";
- if ( strcmp(name,"rdquote")==0 ) return "&8221;";
- if ( strcmp(name,"lquote")==0 ) return "&8216;";
- if ( strcmp(name,"rquote")==0 ) return "&8217;";
- if ( strcmp(name,"mdash")==0 ) return "&8212;";
- if ( strcmp(name,"ndash")==0 ) return "&8211;";
- if ( strcmp(name,"break")==0 ) return "&8232;";
- if ( strcmp(name,"nbhyphen")==0 ) return "&8208;";
- if ( strcmp(name,"nbspace")==0 ) return "&160;";
- if ( strcmp(name,"tab")==0 ) return "&160;&160;&160;";
+ if ( strcmp((const char *)name,"ldquote")==0 ) return "&8220;";
+ if ( strcmp((const char *)name,"rdquote")==0 ) return "&8221;";
+ if ( strcmp((const char *)name,"lquote")==0 ) return "&8216;";
+ if ( strcmp((const char *)name,"rquote")==0 ) return "&8217;";
+ if ( strcmp((const char *)name,"mdash")==0 ) return "&8212;";
+ if ( strcmp((const char *)name,"ndash")==0 ) return "&8211;";
+ if ( strcmp((const char *)name,"break")==0 ) return "&8232;";
+ if ( strcmp((const char *)name,"nbhyphen")==0 ) return "&8208;";
+ if ( strcmp((const char *)name,"nbspace")==0 ) return "&160;";
+ if ( strcmp((const char *)name,"tab")==0 ) return "&160;&160;&160;";
- if ( strcmp(name,"display_text")==0 ) {
+ if ( strcmp((const char *)name,"display_text")==0 ) {
const char *logical_name= loc_getattr( attrs, "logical_name" );
(void)logical_name; /* what to do with it?? (nothing) */
return DISPLAY_TEXT_START;
}
- if ( strcmp(name,"tip")==0 ) {
+ if ( strcmp((const char *)name,"tip")==0 ) {
snprintf(buf, sizeof(buf), TIP_START, helplib_ui_str(HELP_UI_TAG_TIP));
return buf;
}
- if ( strcmp(name,"note")==0 ) {
+ if ( strcmp((const char *)name,"note")==0 ) {
snprintf(buf, sizeof(buf), NOTE_START, helplib_ui_str(HELP_UI_TAG_NOTE));
return buf;
}
- if ( strcmp(name,"example")==0 ) {
+ if ( strcmp((const char *)name,"example")==0 ) {
snprintf(buf, sizeof(buf), EXAMPLE_START, helplib_ui_str(HELP_UI_TAG_EXAMPLE));
return buf;
}
- if ( strcmp(name,"warning")==0 ) {
+ if ( strcmp((const char *)name,"warning")==0 ) {
snprintf(buf, sizeof(buf), WARNING_START, helplib_ui_str(HELP_UI_TAG_WARNING));
return buf;
}
- if ( strcmp(name,"important")==0 ) {
+ if ( strcmp((const char *)name,"important")==0 ) {
snprintf(buf, sizeof(buf), IMPORTANT_START, helplib_ui_str(HELP_UI_TAG_IMPORTANT));
return buf;
}
- if ( strcmp(name,"menu_seq")==0 )
+ if ( strcmp((const char *)name,"menu_seq")==0 )
return MENU_SEQ_START;
- if ( strcmp(name,"task_seq")==0 )
+ if ( strcmp((const char *)name,"task_seq")==0 )
return TASK_SEQ_START;
- if ( strcmp(name,"step")==0 )
+ if ( strcmp((const char *)name,"step")==0 )
return TASK_SEQ_STEP_START;
- if ( strcmp(name,"main_method")==0 )
+ if ( strcmp((const char *)name,"main_method")==0 )
return "";
- if ( strcmp(name,"emphasis")==0 ) {
+ if ( strcmp((const char *)name,"emphasis")==0 ) {
const char *role= loc_getattr( attrs, "role" );
if (!role) role= "";
- if ( strcmp(role,"bold")==0 ) {
+ if ( strcmp((const char *)role,"bold")==0 ) {
emphasis_stop= EMPHASIS_BOLD_STOP;
return EMPHASIS_BOLD_START;
- } else if ( strcmp(role,"italics")==0 ) {
+ } else if ( strcmp((const char *)role,"italics")==0 ) {
emphasis_stop= EMPHASIS_ITALIC_STOP;
return EMPHASIS_ITALIC_START;
} else {
@@ -521,7 +521,7 @@
#endif
- if ( strcmp(name,"graphic")==0 ) {
+ if ( strcmp((const char *)name,"graphic")==0 ) {
gboolean exists= FALSE;
/* Paths to try to find picture files (& suffix mask) */
@@ -608,11 +608,11 @@
}
#ifndef USE_CSS /* Old implementation without CSS */
- if ( strcmp(name,"list")==0 ) {
+ if ( strcmp((const char *)name,"list")==0 ) {
const char *s= loc_getattr( attrs, "style" );
if (!s) s="";
- if ( strcmp(s,"bullet")==0 )
+ if ( strcmp((const char *)s,"bullet")==0 )
s= LIST_STYLE_BULLET;
else
ULOG_WARN( "Unknown <list> style: '%s'", s );
@@ -621,13 +621,13 @@
return buf;
}
- if ( strcmp(name,"listitem")==0 )
+ if ( strcmp((const char *)name,"listitem")==0 )
return LISTITEM_START;
- if ( strcmp(name,"topic")==0 )
+ if ( strcmp((const char *)name,"topic")==0 )
return ""; /*TOPIC_START;*/
- if ( strcmp(name,"topictitle")==0 ) {
+ if ( strcmp((const char *)name,"topictitle")==0 ) {
if (dialog_mode)
goto StartUnknown; /* ignore title text completely */
@@ -635,7 +635,7 @@
}
#endif
- if ( strcmp(name,"ref")==0 ) {
+ if ( strcmp((const char *)name,"ref")==0 ) {
const char *refid= loc_getattr( attrs, "refid" );
const char *refdoc= loc_getattr( attrs, "refdoc" );
@@ -654,7 +654,7 @@
return buf;
}
- if ( strcmp(name,"web_link")==0 ){
+ if ( strcmp((const char *)name,"web_link")==0 ){
const char *url= loc_getattr( attrs, "url" );
if (url) {
/* TBD: Move this to htmltags.cfg once stabilized? */
@@ -676,8 +676,8 @@
/*...*/
/* Some tags knowingly ignored (metadata etc.) */
- if ( (strcmp(name,"context")==0) ||
- (strcmp(name,"synonyms")==0)) {
+ if ( (strcmp((const char *)name,"context")==0) ||
+ (strcmp((const char *)name,"synonyms")==0)) {
unknown_depth++;
return ""; /* ssh.. */
} else {
@@ -741,160 +741,160 @@
return "";
}
- if (strcmp(name,"seealso")==0) {
+ if (strcmp((const char *)name,"seealso")==0) {
return "";
}
/* State independent: */
- if ( (strcmp(name,"b")==0) ||
- (strcmp(name,"i")==0) ||
- (strcmp(name,"sup")==0) ||
- (strcmp(name,"sub")==0) ) {
+ if ( (strcmp((const char *)name,"b")==0) ||
+ (strcmp((const char *)name,"i")==0) ||
+ (strcmp((const char *)name,"sup")==0) ||
+ (strcmp((const char *)name,"sub")==0) ) {
return "</%s>"; /* HTML pass-through */
}
#ifdef USE_CSS /* CSS2 implementation */
- if ( strcmp(name,"para")==0 )
+ if ( strcmp((const char *)name,"para")==0 )
return TAG_BODY_TEXT_STOP;
- if ( strcmp(name,"heading")==0 )
+ if ( strcmp((const char *)name,"heading")==0 )
return TAG_SUBHEADING_STOP;
- if ( (strcmp(name,"ldquote")==0) ||
- (strcmp(name,"rdquote")==0) ||
- (strcmp(name,"lquote")==0) ||
- (strcmp(name,"rquote")==0) ||
- (strcmp(name,"mdash")==0) ||
- (strcmp(name,"ndash")==0) ||
- (strcmp(name,"break")==0) ||
- (strcmp(name,"nbhyphen")==0) ||
- (strcmp(name,"nbspace")==0) ||
- (strcmp(name,"tab")==0) )
+ if ( (strcmp((const char *)name,"ldquote")==0) ||
+ (strcmp((const char *)name,"rdquote")==0) ||
+ (strcmp((const char *)name,"lquote")==0) ||
+ (strcmp((const char *)name,"rquote")==0) ||
+ (strcmp((const char *)name,"mdash")==0) ||
+ (strcmp((const char *)name,"ndash")==0) ||
+ (strcmp((const char *)name,"break")==0) ||
+ (strcmp((const char *)name,"nbhyphen")==0) ||
+ (strcmp((const char *)name,"nbspace")==0) ||
+ (strcmp((const char *)name,"tab")==0) )
return "";
- if ( strcmp(name,"display_text")==0 )
+ if ( strcmp((const char *)name,"display_text")==0 )
return TAG_DISPLAY_TEXT_STOP;
- if ( strcmp(name,"tip")==0 )
+ if ( strcmp((const char *)name,"tip")==0 )
return TAG_TIP_STOP;
- if ( strcmp(name,"note")==0 )
+ if ( strcmp((const char *)name,"note")==0 )
return TAG_NOTE_STOP;
- if ( strcmp(name,"example")==0 )
+ if ( strcmp((const char *)name,"example")==0 )
return TAG_EXAMPLE_STOP;
- if ( strcmp(name,"warning")==0 )
+ if ( strcmp((const char *)name,"warning")==0 )
return TAG_WARNING_STOP;
- if ( strcmp(name,"important")==0 )
+ if ( strcmp((const char *)name,"important")==0 )
return TAG_IMPORTANT_STOP;
- if ( strcmp(name,"menu_seq")==0 )
+ if ( strcmp((const char *)name,"menu_seq")==0 )
return TAG_MENU_SEQUENCE_STOP;
- if ( strcmp(name,"task_seq")==0 )
+ if ( strcmp((const char *)name,"task_seq")==0 )
return TAG_TASK_SEQUENCE_STOP;
- if ( strcmp(name,"step")==0 )
+ if ( strcmp((const char *)name,"step")==0 )
return TAG_TASK_SEQUENCE_STEP_STOP;
- if ( strcmp(name,"main_method")==0 )
+ if ( strcmp((const char *)name,"main_method")==0 )
return "";
- if ( strcmp(name,"graphic")==0 )
+ if ( strcmp((const char *)name,"graphic")==0 )
return "";
- if ( strcmp(name,"ref")==0 )
+ if ( strcmp((const char *)name,"ref")==0 )
return "";
- if ( strcmp(name,"list")==0 )
+ if ( strcmp((const char *)name,"list")==0 )
return TAG_BULLET_LIST_STOP;
- if ( strcmp(name,"listitem")==0 )
+ if ( strcmp((const char *)name,"listitem")==0 )
return TAG_BULLET_LIST_ITEM_STOP;
- if ( strcmp(name,"topic")==0 )
+ if ( strcmp((const char *)name,"topic")==0 )
return "";
- if ( strcmp(name,"topictitle")==0 )
+ if ( strcmp((const char *)name,"topictitle")==0 )
return TAG_TOPIC_TITLE_STOP; /* only comes here in non-dialog mode */
- if ( strcmp(name,"emphasis")==0 )
+ if ( strcmp((const char *)name,"emphasis")==0 )
return TAG_EMPHASIS_STOP;
- if ( strcmp(name,"web_link")==0 )
+ if ( strcmp((const char *)name,"web_link")==0 )
return TAG_WEB_LINK_STOP;
#else /* Old implementation without CSS */
- if ( strcmp(name,"para")==0 )
+ if ( strcmp((const char *)name,"para")==0 )
return PARA_STOP; /*"</p>\n"; // looks smarter :) */
- if ( strcmp(name,"heading")==0 )
+ if ( strcmp((const char *)name,"heading")==0 )
return HEADING_STOP; /*"</hX>";*/
- if ( (strcmp(name,"ldquote")==0) ||
- (strcmp(name,"rdquote")==0) ||
- (strcmp(name,"lquote")==0) ||
- (strcmp(name,"rquote")==0) ||
- (strcmp(name,"mdash")==0) ||
- (strcmp(name,"ndash")==0) ||
- (strcmp(name,"break")==0) ||
- (strcmp(name,"nbhyphen")==0) ||
- (strcmp(name,"nbspace")==0) ||
- (strcmp(name,"tab")==0) )
+ if ( (strcmp((const char *)name,"ldquote")==0) ||
+ (strcmp((const char *)name,"rdquote")==0) ||
+ (strcmp((const char *)name,"lquote")==0) ||
+ (strcmp((const char *)name,"rquote")==0) ||
+ (strcmp((const char *)name,"mdash")==0) ||
+ (strcmp((const char *)name,"ndash")==0) ||
+ (strcmp((const char *)name,"break")==0) ||
+ (strcmp((const char *)name,"nbhyphen")==0) ||
+ (strcmp((const char *)name,"nbspace")==0) ||
+ (strcmp((const char *)name,"tab")==0) )
return "";
- if ( strcmp(name,"display_text")==0 )
+ if ( strcmp((const char *)name,"display_text")==0 )
return DISPLAY_TEXT_STOP;
- if ( strcmp(name,"tip")==0 )
+ if ( strcmp((const char *)name,"tip")==0 )
return TIP_STOP;
- if ( strcmp(name,"note")==0 )
+ if ( strcmp((const char *)name,"note")==0 )
return NOTE_STOP;
- if ( strcmp(name,"example")==0 )
+ if ( strcmp((const char *)name,"example")==0 )
return EXAMPLE_STOP;
- if ( strcmp(name,"warning")==0 )
+ if ( strcmp((const char *)name,"warning")==0 )
return WARNING_STOP;
- if ( strcmp(name,"important")==0 )
+ if ( strcmp((const char *)name,"important")==0 )
return IMPORTANT_STOP;
- if ( strcmp(name,"emphasis")==0 )
+ if ( strcmp((const char *)name,"emphasis")==0 )
return emphasis_stop; /* may vary, based on '<emphasis role>' */
- if ( strcmp(name,"menu_seq")==0 )
+ if ( strcmp((const char *)name,"menu_seq")==0 )
return MENU_SEQ_STOP;
- if ( strcmp(name,"task_seq")==0 )
+ if ( strcmp((const char *)name,"task_seq")==0 )
return TASK_SEQ_STOP;
- if ( strcmp(name,"step")==0 )
+ if ( strcmp((const char *)name,"step")==0 )
return TASK_SEQ_STEP_STOP;
- if ( strcmp(name,"main_method")==0 )
+ if ( strcmp((const char *)name,"main_method")==0 )
return "";
- if ( strcmp(name,"graphic")==0 )
+ if ( strcmp((const char *)name,"graphic")==0 )
return "";
- if ( strcmp(name,"ref")==0 )
+ if ( strcmp((const char *)name,"ref")==0 )
return "";
- if ( strcmp(name,"list")==0 )
+ if ( strcmp((const char *)name,"list")==0 )
return LIST_STOP;
- if ( strcmp(name,"listitem")==0 )
+ if ( strcmp((const char *)name,"listitem")==0 )
return LISTITEM_STOP;
- if ( strcmp(name,"topic")==0 )
+ if ( strcmp((const char *)name,"topic")==0 )
return ""; /*TOPIC_STOP;*/
- if ( strcmp(name,"topictitle")==0 )
+ if ( strcmp((const char *)name,"topictitle")==0 )
return TOPICTITLE_STOP; /* only comes here in non-dialog mode */
#endif
@@ -1045,7 +1045,7 @@
*p4= '\0';
for ( i=0; html_keys[i].key; i++ ) {
- if (strcmp(html_keys[i].key,tag)==0) {
+ if (strcmp((const char *)html_keys[i].key,tag)==0) {
loc_set_html_value( i, val );
break; /* next line, please */
}
Modified: projects/haf/trunk/hildon-help/src/graphic.c
===================================================================
--- projects/haf/trunk/hildon-help/src/graphic.c 2008-11-18 10:54:31 UTC (rev 16720)
+++ projects/haf/trunk/hildon-help/src/graphic.c 2008-11-18 11:00:12 UTC (rev 16721)
@@ -46,7 +46,7 @@
*/
gboolean graphic_tag( char *buf, size_t bufsize, const char *fname)
{
- guint w=0, h=0;
+ gint w=0, h=0;
gboolean ok;
if (!buf || bufsize <= 0 || !fname) return FALSE;
Modified: projects/haf/trunk/hildon-help/src/osso-helplib.c
===================================================================
--- projects/haf/trunk/hildon-help/src/osso-helplib.c 2008-11-18 10:54:31 UTC (rev 16720)
+++ projects/haf/trunk/hildon-help/src/osso-helplib.c 2008-11-18 11:00:12 UTC (rev 16721)
@@ -27,13 +27,13 @@
#include <libosso.h>
#include <osso-log.h>
#include <hildon/hildon.h>
-
+#include <gdk/gdkx.h>
#include <unistd.h>
#include <string.h>
#include <errno.h>
#include <stdlib.h> /* getenv() */
#include <stdio.h> /* FILE* */
-
+#include <X11/Xlib.h>
#include <libintl.h>
/* Not waiting for Help UI to give a return value (trying to
- Previous message: [maemo-commits] r16720 - in projects/haf/trunk/hildon-thumbnail: . daemon daemon/plugins
- Next message: [maemo-commits] r16722 - projects/haf/trunk/hildon-thumbnail/daemon/plugins
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]