← Back to branch summary

~evfool/midori/lp792536

« back to all changes in this revision

Viewing changes to midori/midori-browser.c

  • Committer: Christian Dywan
  • Author(s): Enrico Tröger
  • Date: 2009-04-26 23:11:58 UTC
  • Revision ID: git-v1:ba7e8846ee6cf586d2b66cad019751fa5b42e4f2
Do not display any icon if there's no news feed available

Work around a bug that made unsetting the secondary icon in the
location entry impossible and do not set an icon if there is
no news feed instead of an 'information' icon.

Show diffs side-by-side

added added

removed removed

Lines of Context:
midori/midori-browser.c
312
312
            MIDORI_LOCATION_ACTION (action), STOCK_NEWS_FEED);
313
313
    else
314
314
        midori_location_action_set_secondary_icon (
315
 
            MIDORI_LOCATION_ACTION (action), GTK_STOCK_INFO);
 
315
            MIDORI_LOCATION_ACTION (action), NULL);
316
316
}
317
317
 
318
318
static void
420
420
            midori_location_action_set_uri (
421
421
                MIDORI_LOCATION_ACTION (action), uri);
422
422
            midori_location_action_set_secondary_icon (
423
 
                MIDORI_LOCATION_ACTION (action), GTK_STOCK_INFO);
 
423
                MIDORI_LOCATION_ACTION (action), NULL);
424
424
            g_object_notify (G_OBJECT (browser), "uri");
425
425
        }
426
426
 
4003
4003
        "label", _("_Location..."),
4004
4004
        "stock-id", GTK_STOCK_JUMP_TO,
4005
4005
        "tooltip", _("Open a particular location"),
4006
 
        /* FIXME: Due to a bug in GtkIconEntry we need to set an initial icon */
4007
 
        "secondary-icon", STOCK_NEWS_FEED,
4008
4006
        NULL);
4009
4007
    g_object_connect (action,
4010
4008
                      "signal::activate",