[maemo-commits] [maemo-commits] r10802 - in projects/haf/trunk/hildon-desktop: . libhildondesktop src
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Wed Mar 28 13:16:12 EEST 2007
- Previous message: [maemo-commits] r10801 - projects/haf/hafbuildbot
- Next message: [maemo-commits] r10803 - in projects/haf/trunk/hildon-theme-layout-4: . rc
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: lucasr Date: 2007-03-28 13:16:09 +0300 (Wed, 28 Mar 2007) New Revision: 10802 Modified: projects/haf/trunk/hildon-desktop/ChangeLog projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-window-dialog.c projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-plugin.c projects/haf/trunk/hildon-desktop/libhildondesktop/libhildonmenu.c projects/haf/trunk/hildon-desktop/src/hd-desktop.c projects/haf/trunk/hildon-desktop/src/hd-home-background.c projects/haf/trunk/hildon-desktop/src/hd-plugin-loader-factory.c Log: 2007-03-28 Lucas Rocha <lucas.rocha at nokia.com> * src/hd-home-background.c, src/hd-desktop.c, src/hd-plugin-loader-factory.c, libhildondesktop/libhildonmenu.c, libhildondesktop/hildon-desktop-plugin.c, libhildondesktop/hildon-desktop-panel-window-dialog.c: fixed a bunch of build warnings. Modified: projects/haf/trunk/hildon-desktop/ChangeLog =================================================================== --- projects/haf/trunk/hildon-desktop/ChangeLog 2007-03-28 08:11:03 UTC (rev 10801) +++ projects/haf/trunk/hildon-desktop/ChangeLog 2007-03-28 10:16:09 UTC (rev 10802) @@ -1,3 +1,11 @@ +2007-03-28 Lucas Rocha <lucas.rocha at nokia.com> + + * src/hd-home-background.c, src/hd-desktop.c, + src/hd-plugin-loader-factory.c, libhildondesktop/libhildonmenu.c, + libhildondesktop/hildon-desktop-plugin.c, + libhildondesktop/hildon-desktop-panel-window-dialog.c: fixed a bunch + of build warnings. + 2007-03-27 Lucas Rocha <lucas.rocha at nokia.com> * autogen.sh: run configure script to be jhbuild friendly. Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-window-dialog.c =================================================================== --- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-window-dialog.c 2007-03-28 08:11:03 UTC (rev 10801) +++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-window-dialog.c 2007-03-28 10:16:09 UTC (rev 10802) @@ -101,7 +101,7 @@ Atom atom_utf8_string, atom_wm_name, atom_check, type; int result, format; gchar *retval; - unsigned char *val; + unsigned char *val; unsigned long nitems, bytes_after; Display *dpy; union @@ -140,7 +140,7 @@ return NULL; } - retval = g_strdup (val); + retval = g_strdup ((char *) val); XFree (val); XFree (support_xwin.s); Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-plugin.c =================================================================== --- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-plugin.c 2007-03-28 08:11:03 UTC (rev 10801) +++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-plugin.c 2007-03-28 10:16:09 UTC (rev 10802) @@ -179,10 +179,10 @@ if (!g_module_symbol (plugin->priv->library, "hildon_desktop_plugin_load", - (gpointer *) &plugin->priv->load) || + (void *) &plugin->priv->load) || !g_module_symbol (plugin->priv->library, "hildon_desktop_plugin_unload", - (gpointer *) &plugin->priv->unload)) + (void *) &plugin->priv->unload)) { g_warning (g_module_error ()); Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/libhildonmenu.c =================================================================== --- projects/haf/trunk/hildon-desktop/libhildondesktop/libhildonmenu.c 2007-03-28 08:11:03 UTC (rev 10801) +++ projects/haf/trunk/hildon-desktop/libhildondesktop/libhildonmenu.c 2007-03-28 10:16:09 UTC (rev 10802) @@ -675,7 +675,7 @@ current_element != NULL; current_element = current_element->next) { - if (strcmp(current_element->name, "Menu") == 0) { + if (strcmp((const char *) current_element->name, "Menu") == 0) { /* Submenu */ g_debug( "read_menu_conf: " @@ -685,7 +685,7 @@ read_menu_conf(filename, menu_tree, doc, current_element, &child_iterator, desktop_files); - } else if (strcmp(current_element->name, "Name") == 0) { + } else if (strcmp((const char *) current_element->name, "Name") == 0) { if (level == 0) { /* H4rd c0d3d for top level */ @@ -720,13 +720,13 @@ "", -1); - if ( strcmp( key, EXTRAS_MENU_STRING ) == 0 ) { + if ( strcmp((const char *) key, EXTRAS_MENU_STRING ) == 0 ) { extras_iter = gtk_tree_iter_copy( iterator ); } xmlFree(key); - } else if (strcmp(current_element->name, "MergeFile") == 0) { + } else if (strcmp((const char *) current_element->name, "MergeFile") == 0) { /* FIXME: skip this for now */ continue; @@ -735,17 +735,17 @@ current_element->xmlChildrenNode, 1); /* Relative path. prepend current dir */ - if (g_str_has_prefix(key, "/") == FALSE) { - key = g_build_path(G_DIR_SEPARATOR_S, + if (g_str_has_prefix((const char *) key, "/") == FALSE) { + key = (xmlChar *) g_build_path(G_DIR_SEPARATOR_S, g_path_get_dirname(filename), key, NULL); } /* Recursion */ - read_menu_conf(key, menu_tree, NULL, NULL, iterator, desktop_files); + read_menu_conf((const char *) key, menu_tree, NULL, NULL, iterator, desktop_files); xmlFree(key); - } else if (strcmp(current_element->name, "Include") == 0) { + } else if (strcmp((const char *) current_element->name, "Include") == 0) { xmlNodePtr child_element = NULL; @@ -753,20 +753,20 @@ child_element != NULL; child_element = child_element->next) { - if (strcmp(child_element->name, "Filename") == 0) { + if (strcmp((const char *) child_element->name, "Filename") == 0) { /* Get the children */ key = xmlNodeListGetString(doc, child_element->xmlChildrenNode, 1); - if ( !key || strlen( key ) == 0) { + if ( !key || strlen((const char *) key) == 0) { xmlFree( key ); continue; } /* Get the contents */ - item = get_desktop_item(desktop_files, key); + item = get_desktop_item(desktop_files, (const char *) key); if ( !item ) { xmlFree( key ); @@ -818,7 +818,7 @@ - } else if (strcmp(current_element->name, "Separator") == 0) { + } else if (strcmp((const char *) current_element->name, "Separator") == 0) { g_debug( "read_menu_conf: level %i: " "appending separator.", level ); @@ -1100,7 +1100,7 @@ } /* <Name> ... </Name> */ - if ( xmlTextWriterWriteElement( writer, "Name", name ) < 0 ) { + if ( xmlTextWriterWriteElement( writer, (const xmlChar *) "Name", (const xmlChar *) name ) < 0 ) { g_warning( "write_menu_conf: " "failed to write Name element." ); goto cleanup_and_exit; @@ -1149,7 +1149,7 @@ /* This returns -1 for some reason. But this seems to work * and without this it doesn't work. Oh well.. */ - xmlTextWriterWriteElement( writer, "Separator", NULL ); + xmlTextWriterWriteElement( writer, (const xmlChar *) "Separator", NULL ); xmlTextWriterEndElement( writer ); g_debug( "write_menu_conf: <Separator/>" ); @@ -1171,7 +1171,7 @@ /* <Filename> ... </Filename> */ if ( xmlTextWriterWriteElement( writer, - "Filename", desktop_id ) < 0 ) { + (const xmlChar *) "Filename", (const xmlChar *) desktop_id ) < 0 ) { g_warning( "write_menu_conf: " "failed to write Filename element." ); goto cleanup_and_exit; Modified: projects/haf/trunk/hildon-desktop/src/hd-desktop.c =================================================================== --- projects/haf/trunk/hildon-desktop/src/hd-desktop.c 2007-03-28 08:11:03 UTC (rev 10801) +++ projects/haf/trunk/hildon-desktop/src/hd-desktop.c 2007-03-28 10:16:09 UTC (rev 10802) @@ -191,7 +191,7 @@ } } - buffer = g_key_file_to_data (keyfile, &buffer_size, &error); + buffer = g_key_file_to_data (keyfile, (gsize *) &buffer_size, &error); if (error) { Modified: projects/haf/trunk/hildon-desktop/src/hd-home-background.c =================================================================== --- projects/haf/trunk/hildon-desktop/src/hd-home-background.c 2007-03-28 08:11:03 UTC (rev 10801) +++ projects/haf/trunk/hildon-desktop/src/hd-home-background.c 2007-03-28 10:16:09 UTC (rev 10802) @@ -397,7 +397,7 @@ } buffer = g_key_file_to_data (keyfile, - &buffer_length, + (gsize *) &buffer_length, &local_error); if (local_error) goto cleanup; Modified: projects/haf/trunk/hildon-desktop/src/hd-plugin-loader-factory.c =================================================================== --- projects/haf/trunk/hildon-desktop/src/hd-plugin-loader-factory.c 2007-03-28 08:11:03 UTC (rev 10801) +++ projects/haf/trunk/hildon-desktop/src/hd-plugin-loader-factory.c 2007-03-28 10:16:09 UTC (rev 10802) @@ -133,7 +133,7 @@ { if (g_module_symbol (module, MODULE_LOAD_SYMBOL, - (gpointer *) &factory->priv->load_module)) + (void *) &factory->priv->load_module)) { g_hash_table_insert (factory->priv->modules, factory->priv->load_module (), @@ -312,7 +312,7 @@ { if (g_module_symbol (module, MODULE_GET_INSTANCE_SYMBOL, - (gpointer *) &factory->priv->get_instance)) + (void *) &factory->priv->get_instance)) { loader = priv->get_instance ();
- Previous message: [maemo-commits] r10801 - projects/haf/hafbuildbot
- Next message: [maemo-commits] r10803 - in projects/haf/trunk/hildon-theme-layout-4: . rc
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]