projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix some introspection warnings
[platform/upstream/glib.git]
/
gio
/
gthemedicon.c
diff --git
a/gio/gthemedicon.c
b/gio/gthemedicon.c
index
ba658fa
..
3d72bc2
100644
(file)
--- a/
gio/gthemedicon.c
+++ b/
gio/gthemedicon.c
@@
-13,9
+13,7
@@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
*
* Author: Alexander Larsson <alexl@redhat.com>
*/
*
* Author: Alexander Larsson <alexl@redhat.com>
*/
@@
-259,7
+257,7
@@
g_themed_icon_class_init (GThemedIconClass *klass)
*
* For example, if the icon name was "gnome-dev-cdrom-audio", the array
* would become
*
* For example, if the icon name was "gnome-dev-cdrom-audio", the array
* would become
- * |[
+ * |[
<!-- language="C" -->
* {
* "gnome-dev-cdrom-audio",
* "gnome-dev-cdrom",
* {
* "gnome-dev-cdrom-audio",
* "gnome-dev-cdrom",
@@
-347,7
+345,7
@@
g_themed_icon_new_from_names (char **iconnames,
* that can be created by shortening @iconname at '-' characters.
*
* In the following example, @icon1 and @icon2 are equivalent:
* that can be created by shortening @iconname at '-' characters.
*
* In the following example, @icon1 and @icon2 are equivalent:
- * |[
+ * |[
<!-- language="C" -->
* const char *names[] = {
* "gnome-dev-cdrom-audio",
* "gnome-dev-cdrom",
* const char *names[] = {
* "gnome-dev-cdrom-audio",
* "gnome-dev-cdrom",
@@
-392,10
+390,8
@@
g_themed_icon_get_names (GThemedIcon *icon)
*
* Append a name to the list of icons from within @icon.
*
*
* Append a name to the list of icons from within @icon.
*
- * <note><para>
* Note that doing so invalidates the hash computed by prior calls
* to g_icon_hash().
* Note that doing so invalidates the hash computed by prior calls
* to g_icon_hash().
- * </para></note>
*/
void
g_themed_icon_append_name (GThemedIcon *icon,
*/
void
g_themed_icon_append_name (GThemedIcon *icon,
@@
-421,10
+417,8
@@
g_themed_icon_append_name (GThemedIcon *icon,
*
* Prepend a name to the list of icons from within @icon.
*
*
* Prepend a name to the list of icons from within @icon.
*
- * <note><para>
* Note that doing so invalidates the hash computed by prior calls
* to g_icon_hash().
* Note that doing so invalidates the hash computed by prior calls
* to g_icon_hash().
- * </para></note>
*
* Since: 2.18
*/
*
* Since: 2.18
*/
@@
-514,7
+508,17
@@
g_themed_icon_from_tokens (gchar **tokens,
gchar **names;
int n;
gchar **names;
int n;
- g_return_val_if_fail (version == 0, NULL);
+ icon = NULL;
+
+ if (version != 0)
+ {
+ g_set_error (error,
+ G_IO_ERROR,
+ G_IO_ERROR_INVALID_ARGUMENT,
+ _("Can't handle version %d of GThemedIcon encoding"),
+ version);
+ goto out;
+ }
names = g_new0 (gchar *, num_tokens + 1);
for (n = 0; n < num_tokens; n++)
names = g_new0 (gchar *, num_tokens + 1);
for (n = 0; n < num_tokens; n++)
@@
-524,6
+528,7
@@
g_themed_icon_from_tokens (gchar **tokens,
icon = g_themed_icon_new_from_names (names, num_tokens);
g_free (names);
icon = g_themed_icon_new_from_names (names, num_tokens);
g_free (names);
+ out:
return icon;
}
return icon;
}