* Use g_value_dup_object instead of g_object_ref and g_value_get_object.
@@ -405,7 +405,7 @@ | ||
405 | 405 | switch (prop_id) |
406 | 406 | { |
407 | 407 | case PROP_KZ_WINDOW: |
408 | - tablabel->kz = g_object_ref(g_value_get_object(value)); | |
408 | + tablabel->kz = g_value_dup_object(value); | |
409 | 409 | break; |
410 | 410 | case PROP_KZ_WEB: |
411 | 411 | kz_tab_label_set_web(tablabel, g_value_get_object(value)); |
@@ -76,7 +76,7 @@ | ||
76 | 76 | switch (prop_id) |
77 | 77 | { |
78 | 78 | case PROP_KZ_WINDOW: |
79 | - info->kz = g_object_ref(g_value_get_object(value)); | |
79 | + info->kz = g_value_dup_object(value); | |
80 | 80 | break; |
81 | 81 | default: |
82 | 82 | G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); |
@@ -290,7 +290,7 @@ | ||
290 | 290 | switch (prop_id) |
291 | 291 | { |
292 | 292 | case PROP_PARENT_WINDOW: |
293 | - copy_format->parent_window = g_object_ref(g_value_get_object(value)); | |
293 | + copy_format->parent_window = g_value_dup_object(value); | |
294 | 294 | break; |
295 | 295 | default: |
296 | 296 | G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); |
@@ -317,10 +317,10 @@ | ||
317 | 317 | switch (prop_id) |
318 | 318 | { |
319 | 319 | case PROP_PARENT_WINDOW: |
320 | - kzlinks->parent_window = g_object_ref(g_value_get_object(value)); | |
320 | + kzlinks->parent_window = g_value_dup_object(value); | |
321 | 321 | break; |
322 | 322 | case PROP_KZ_WEB: |
323 | - kzlinks->kzweb = g_object_ref(g_value_get_object(value)); | |
323 | + kzlinks->kzweb = g_value_dup_object(value); | |
324 | 324 | break; |
325 | 325 | case PROP_SELECTED_ONLY: |
326 | 326 | kzlinks->selected_only = g_value_get_boolean(value); |
@@ -374,9 +374,7 @@ | ||
374 | 374 | case PROP_PARENT_WINDOW: |
375 | 375 | if (priv->parent_window) |
376 | 376 | g_object_unref(priv->parent_window); |
377 | - priv->parent_window = g_value_get_object(value); | |
378 | - if (priv->parent_window) | |
379 | - g_object_ref(priv->parent_window); | |
377 | + priv->parent_window = g_value_dup_object(value); | |
380 | 378 | break; |
381 | 379 | default: |
382 | 380 | G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); |
@@ -258,7 +258,7 @@ | ||
258 | 258 | switch (prop_id) |
259 | 259 | { |
260 | 260 | case PROP_PARENT_WINDOW: |
261 | - password_manager->parent_window = g_object_ref(g_value_get_object(value)); | |
261 | + password_manager->parent_window = g_value_dup_object(value); | |
262 | 262 | break; |
263 | 263 | default: |
264 | 264 | G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); |
@@ -332,7 +332,7 @@ | ||
332 | 332 | switch (prop_id) |
333 | 333 | { |
334 | 334 | case PROP_PARENT_WINDOW: |
335 | - print->parent_window = g_object_ref(g_value_get_object(value)); | |
335 | + print->parent_window = g_value_dup_object(value); | |
336 | 336 | break; |
337 | 337 | default: |
338 | 338 | G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); |
@@ -191,7 +191,7 @@ | ||
191 | 191 | switch (prop_id) |
192 | 192 | { |
193 | 193 | case PROP_SIDEBAR: |
194 | - sidebar->sidebar = g_object_ref(g_value_get_object(value)); | |
194 | + sidebar->sidebar = g_value_dup_object(value); | |
195 | 195 | break; |
196 | 196 | default: |
197 | 197 | G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); |
@@ -149,7 +149,7 @@ | ||
149 | 149 | switch (prop_id) |
150 | 150 | { |
151 | 151 | case PROP_SIDEBAR: |
152 | - sidebar->sidebar = g_object_ref(g_value_get_object(value)); | |
152 | + sidebar->sidebar = g_value_dup_object(value); | |
153 | 153 | break; |
154 | 154 | default: |
155 | 155 | G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); |
@@ -338,7 +338,7 @@ | ||
338 | 338 | switch (prop_id) |
339 | 339 | { |
340 | 340 | case PROP_SIDEBAR: |
341 | - sidebar->sidebar = g_object_ref(g_value_get_object(value)); | |
341 | + sidebar->sidebar = g_value_dup_object(value); | |
342 | 342 | break; |
343 | 343 | default: |
344 | 344 | G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); |
@@ -369,7 +369,7 @@ | ||
369 | 369 | switch (prop_id) |
370 | 370 | { |
371 | 371 | case PROP_SIDEBAR: |
372 | - tabtree->sidebar = g_object_ref(g_value_get_object(value)); | |
372 | + tabtree->sidebar = g_value_dup_object(value); | |
373 | 373 | break; |
374 | 374 | case PROP_TREE: |
375 | 375 | tabtree->tree = g_value_get_boolean(value); |
@@ -238,7 +238,7 @@ | ||
238 | 238 | switch (prop_id) |
239 | 239 | { |
240 | 240 | case PROP_KZ_WINDOW: |
241 | - priv->kz = g_object_ref(g_value_get_object(value)); | |
241 | + priv->kz = g_value_dup_object(value); | |
242 | 242 | break; |
243 | 243 | default: |
244 | 244 | G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); |
@@ -164,7 +164,7 @@ | ||
164 | 164 | g_value_get_pointer(value)); |
165 | 165 | break; |
166 | 166 | case PROP_SMART_HISTORY: |
167 | - priv->history = g_object_ref(g_value_get_object(value)); | |
167 | + priv->history = g_value_dup_object(value); | |
168 | 168 | break; |
169 | 169 | default: |
170 | 170 | G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); |
@@ -288,10 +288,8 @@ | ||
288 | 288 | { |
289 | 289 | case PROP_ROOT_FOLDER: |
290 | 290 | if (editor->root_folder) |
291 | - { | |
292 | 291 | g_object_unref(editor->root_folder); |
293 | - } | |
294 | - editor->root_folder = g_object_ref(g_value_get_object(value)); | |
292 | + editor->root_folder = g_value_dup_object(value); | |
295 | 293 | |
296 | 294 | kz_bookmark_editor_set_folder_tree(editor); |
297 | 295 | kz_bookmark_editor_set_bookmark_tree(editor, editor->root_folder); |
@@ -372,10 +372,10 @@ | ||
372 | 372 | switch (prop_id) |
373 | 373 | { |
374 | 374 | case PROP_BOOKMARK: |
375 | - menu->bookmark = g_object_ref(g_value_get_object(value)); | |
375 | + menu->bookmark = g_value_dup_object(value); | |
376 | 376 | break; |
377 | 377 | case PROP_KZ_WINDOW: |
378 | - menu->kz = g_object_ref(g_value_get_object(value)); | |
378 | + menu->kz = g_value_dup_object(value); | |
379 | 379 | break; |
380 | 380 | default: |
381 | 381 | G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); |
@@ -252,10 +252,10 @@ | ||
252 | 252 | switch (prop_id) |
253 | 253 | { |
254 | 254 | case PROP_KZ_WINDOW: |
255 | - bar->kz = g_object_ref(g_value_get_object(value)); | |
255 | + bar->kz = g_value_dup_object(value); | |
256 | 256 | break; |
257 | 257 | case PROP_BOOKMARK_LIST: |
258 | - bar->folder = g_object_ref(g_value_get_object(value)); | |
258 | + bar->folder = g_value_dup_object(value); | |
259 | 259 | kz_bookmark_bar_connect_signal(bar); |
260 | 260 | break; |
261 | 261 | default: |
@@ -187,7 +187,7 @@ | ||
187 | 187 | switch (prop_id) |
188 | 188 | { |
189 | 189 | case PROP_KZ_BOOKMARK_FOLDER: |
190 | - priv->folder = g_object_ref(g_value_get_object(value)); | |
190 | + priv->folder = g_value_dup_object(value); | |
191 | 191 | break; |
192 | 192 | default: |
193 | 193 | G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); |
@@ -161,10 +161,10 @@ | ||
161 | 161 | switch (prop_id) |
162 | 162 | { |
163 | 163 | case PROP_BOOKMARK: |
164 | - menu->bookmark = g_object_ref(g_value_get_object(value)); | |
164 | + menu->bookmark = g_value_dup_object(value); | |
165 | 165 | break; |
166 | 166 | case PROP_KZ_WINDOW: |
167 | - menu->kz = g_object_ref(g_value_get_object(value)); | |
167 | + menu->kz = g_value_dup_object(value); | |
168 | 168 | break; |
169 | 169 | default: |
170 | 170 | G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); |
@@ -160,7 +160,7 @@ | ||
160 | 160 | switch (prop_id) |
161 | 161 | { |
162 | 162 | case PROP_KZ_WINDOW: |
163 | - priv->kz = g_object_ref(g_value_get_object(value)); | |
163 | + priv->kz = g_value_dup_object(value); | |
164 | 164 | break; |
165 | 165 | default: |
166 | 166 | G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); |
@@ -182,7 +182,7 @@ | ||
182 | 182 | switch (prop_id) |
183 | 183 | { |
184 | 184 | case PROP_KZ_WINDOW: |
185 | - sidebar->kz = g_object_ref(g_value_get_object(value)); | |
185 | + sidebar->kz = g_value_dup_object(value); | |
186 | 186 | break; |
187 | 187 | default: |
188 | 188 | G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); |
@@ -159,7 +159,7 @@ | ||
159 | 159 | switch (prop_id) |
160 | 160 | { |
161 | 161 | case PROP_KZ_WINDOW: |
162 | - priv->kz = g_object_ref(g_value_get_object(value)); | |
162 | + priv->kz = g_value_dup_object(value); | |
163 | 163 | break; |
164 | 164 | default: |
165 | 165 | G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); |
@@ -141,7 +141,7 @@ | ||
141 | 141 | switch (prop_id) |
142 | 142 | { |
143 | 143 | case PROP_KZ_WINDOW: |
144 | - dlbox->kz = g_object_ref(g_value_get_object(value)); | |
144 | + dlbox->kz = g_value_dup_object(value); | |
145 | 145 | break; |
146 | 146 | default: |
147 | 147 | G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); |
@@ -175,10 +175,10 @@ | ||
175 | 175 | switch (prop_id) |
176 | 176 | { |
177 | 177 | case PROP_KZ_WINDOW: |
178 | - action->kz = g_object_ref(g_value_get_object(value)); | |
178 | + action->kz = g_value_dup_object(value); | |
179 | 179 | break; |
180 | 180 | case PROP_KZ_BOOKMARK: |
181 | - action->bookmark = g_object_ref(g_value_get_object(value)); | |
181 | + action->bookmark = g_value_dup_object(value); | |
182 | 182 | break; |
183 | 183 | case PROP_TEXT: |
184 | 184 | g_free(action->text); |
@@ -148,10 +148,10 @@ | ||
148 | 148 | switch (prop_id) |
149 | 149 | { |
150 | 150 | case PROP_BOOKMARK: |
151 | - action->bookmark = g_object_ref(g_value_get_object(value)); | |
151 | + action->bookmark = g_value_dup_object(value); | |
152 | 152 | break; |
153 | 153 | case PROP_KZ_WINDOW: |
154 | - action->kz = g_object_ref(g_value_get_object(value)); | |
154 | + action->kz = g_value_dup_object(value); | |
155 | 155 | break; |
156 | 156 | default: |
157 | 157 | G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); |
@@ -177,12 +177,12 @@ | ||
177 | 177 | switch (prop_id) |
178 | 178 | { |
179 | 179 | case PROP_KZ_WINDOW: |
180 | - action->kz = g_object_ref(g_value_get_object(value)); | |
180 | + action->kz = g_value_dup_object(value); | |
181 | 181 | break; |
182 | 182 | case PROP_KZ_BOOKMARK: |
183 | 183 | if (action->bookmark) |
184 | 184 | g_object_unref(action->bookmark); |
185 | - action->bookmark = g_object_ref(g_value_get_object(value)); | |
185 | + action->bookmark = g_value_dup_object(value); | |
186 | 186 | break; |
187 | 187 | default: |
188 | 188 | G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); |
@@ -119,7 +119,7 @@ | ||
119 | 119 | switch (prop_id) |
120 | 120 | { |
121 | 121 | case PROP_KZ_WINDOW: |
122 | - priv->kz = g_object_ref(g_value_get_object(value)); | |
122 | + priv->kz = g_value_dup_object(value); | |
123 | 123 | break; |
124 | 124 | default: |
125 | 125 | G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); |
@@ -196,10 +196,10 @@ | ||
196 | 196 | switch (prop_id) |
197 | 197 | { |
198 | 198 | case PROP_KZ_WINDOW: |
199 | - action->kz = g_object_ref(g_value_get_object(value)); | |
199 | + action->kz = g_value_dup_object(value); | |
200 | 200 | break; |
201 | 201 | case PROP_KZ_BOOKMARK: |
202 | - action->bookmark = g_object_ref(g_value_get_object(value)); | |
202 | + action->bookmark = g_value_dup_object(value); | |
203 | 203 | /* if bookmark is a folder, connect signals */ |
204 | 204 | if (kz_bookmark_is_folder(action->bookmark)) |
205 | 205 | { |
@@ -137,7 +137,7 @@ | ||
137 | 137 | switch (prop_id) |
138 | 138 | { |
139 | 139 | case PROP_KZ_WINDOW: |
140 | - priv->kz = g_object_ref(g_value_get_object(value)); | |
140 | + priv->kz = g_value_dup_object(value); | |
141 | 141 | break; |
142 | 142 | case PROP_STATE: |
143 | 143 | priv->state = g_value_get_int(value); |
@@ -111,7 +111,7 @@ | ||
111 | 111 | switch (prop_id) |
112 | 112 | { |
113 | 113 | case PROP_KZ_WINDOW: |
114 | - action->kz = g_object_ref(g_value_get_object(value)); | |
114 | + action->kz = g_value_dup_object(value); | |
115 | 115 | break; |
116 | 116 | default: |
117 | 117 | G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); |
@@ -1,5 +1,9 @@ | ||
1 | 1 | 2009-10-03 Hiroyuki Ikezoe <poincare@ikezoe.net> |
2 | 2 | |
3 | + * Use g_value_dup_object instead of g_object_ref and g_value_get_object. | |
4 | + | |
5 | +2009-10-03 Hiroyuki Ikezoe <poincare@ikezoe.net> | |
6 | + | |
3 | 7 | * src/kz-web.c: Implement missin kz_web_get_dest_anchors(). |
4 | 8 | |
5 | 9 | 2009-09-29 Hiroyuki Ikezoe <poincare@ikezoe.net> |