blob: 7ac895169016d8c6c635c7ddcce1dd03075b142f (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
diff --exclude-from=/home/dang/.diffrc -u -ruN gaim-2.0.0beta3.orig/src/blist.c gaim-2.0.0beta3/src/blist.c
--- gaim-2.0.0beta3.orig/src/blist.c 2006-03-13 13:31:21.000000000 -0500
+++ gaim-2.0.0beta3/src/blist.c 2006-08-15 16:30:12.000000000 -0400
@@ -2493,7 +2493,8 @@
if (value == NULL)
return FALSE;
- g_return_val_if_fail(gaim_value_get_type(value) == GAIM_TYPE_BOOLEAN, FALSE);
+ if (!(gaim_value_get_type(value) == GAIM_TYPE_BOOLEAN))
+ return (FALSE);
return gaim_value_get_boolean(value);
}
@@ -2529,7 +2530,8 @@
if (value == NULL)
return 0;
- g_return_val_if_fail(gaim_value_get_type(value) == GAIM_TYPE_INT, 0);
+ if (!(gaim_value_get_type(value) == GAIM_TYPE_INT))
+ return (0);
return gaim_value_get_int(value);
}
@@ -2565,7 +2567,8 @@
if (value == NULL)
return NULL;
- g_return_val_if_fail(gaim_value_get_type(value) == GAIM_TYPE_STRING, NULL);
+ if (!(gaim_value_get_type(value) == GAIM_TYPE_STRING))
+ return (NULL);
return gaim_value_get_string(value);
}
diff --exclude-from=/home/dang/.diffrc -u -ruN gaim-2.0.0beta3.orig/src/dbus-server.c gaim-2.0.0beta3/src/dbus-server.c
--- gaim-2.0.0beta3.orig/src/dbus-server.c 2006-02-11 00:25:47.000000000 -0500
+++ gaim-2.0.0beta3/src/dbus-server.c 2006-08-15 16:46:47.000000000 -0400
@@ -96,7 +96,8 @@
gint gaim_dbus_pointer_to_id(gpointer node) {
gint id = GPOINTER_TO_INT(g_hash_table_lookup(map_node_id, node));
- g_return_val_if_fail(id || node == NULL, 0);
+ if (!(id || node == NULL))
+ return (0);
return id;
}
|
GitWeb
