Midori Web Browser

Merge lp:~kalikiana/midori/iconcrash into lp:midori

  1. iconcrash
  2. Merge into trunk
Proposed by Cris Dywan
Status: Merged
Approved by: André Stösel
Approved revision: 6232
Merged at revision: 6232
Proposed branch: lp:~kalikiana/midori/iconcrash
Merge into: lp:midori
Diff against target: 12 lines (+1/-1)
1 file modified
katze/katze-item.c (+1/-1)
To merge this branch: bzr merge lp:~kalikiana/midori/iconcrash
Reviewer Review Type Date Requested Status
André Stösel Approve
Review via email: mp+171362@code.launchpad.net

Commit message

Use NULL-safe comparison in katze_item_icon_loaded_cb

Description of the change

Use NULL-safe comparison in katze_item_icon_loaded_cb

To post a comment you must log in.
Revision history for this message
André Stösel (ivaldi) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'katze/katze-item.c'
2--- katze/katze-item.c 2013-06-19 20:27:53 +0000
3+++ katze/katze-item.c 2013-06-25 16:31:44 +0000
4@@ -465,7 +465,7 @@
5 {
6 KatzeItem* item = g_object_get_data (G_OBJECT (image), "KatzeItem");
7 GdkPixbuf* pixbuf;
8- if (!strcmp (frame_uri, item->uri)
9+ if (!g_strcmp0 (frame_uri, item->uri)
10 && (pixbuf = midori_paths_get_icon (frame_uri, image)))
11 {
12 gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf);

Subscribers

People subscribed via source and target branches

to all changes: