← Back to branch summary

~midori/midori/trunk

« back to all changes in this revision

Viewing changes to midori/midori-searchaction.c

  • Committer: Christian Dywan
  • Date: 2013-06-21 20:49:53 UTC
  • mto: This revision was merged to the branch mainline in revision 6228.
  • Revision ID: christian.dywan@canonical.com-20130621204953-5t9d2juxo95eihve
Remove Gtk.IconEntry compatibility aliases

Show diffs side-by-side

added added

removed removed

Lines of Context:
midori/midori-searchaction.c
312
312
 
313
313
    toolitem = GTK_WIDGET (gtk_tool_item_new ());
314
314
    entry = sokoke_search_entry_new (NULL);
315
 
    gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (entry),
316
 
                                       GTK_ICON_ENTRY_PRIMARY, TRUE);
 
315
    gtk_entry_set_icon_activatable (GTK_ENTRY (entry),
 
316
                                       GTK_ENTRY_ICON_PRIMARY, TRUE);
317
317
    alignment = gtk_alignment_new (0, 0.5, 1, 0.1);
318
318
    gtk_container_add (GTK_CONTAINER (alignment), entry);
319
319
    gtk_widget_show (entry);
402
402
 
403
403
static void
404
404
midori_search_action_icon_released_cb (GtkWidget*           entry,
405
 
                                       GtkIconEntryPosition icon_pos,
 
405
                                       GtkEntryIconPosition icon_pos,
406
406
                                       gint                 button,
407
407
                                       GtkAction*           action)
408
408
{
413
413
    GdkPixbuf* icon;
414
414
    GtkWidget* image;
415
415
 
416
 
    if (icon_pos == GTK_ICON_ENTRY_SECONDARY)
 
416
    if (icon_pos == GTK_ENTRY_ICON_SECONDARY)
417
417
        return;
418
418
 
419
419
    search_engines = MIDORI_SEARCH_ACTION (action)->search_engines;
502
502
                icon_name = "edit-find-option";
503
503
            else
504
504
                icon_name = STOCK_EDIT_FIND;
505
 
            gtk_icon_entry_set_icon_from_icon_name (GTK_ICON_ENTRY (entry),
506
 
                GTK_ICON_ENTRY_PRIMARY, icon_name);
 
505
            gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry),
 
506
                GTK_ENTRY_ICON_PRIMARY, icon_name);
507
507
        }
508
508
        gtk_entry_set_placeholder_text (GTK_ENTRY (entry),
509
509
            katze_item_get_name (search_action->current_item));
510
510
    }
511
511
    else
512
512
    {
513
 
        gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry),
514
 
                                            GTK_ICON_ENTRY_PRIMARY,
 
513
        gtk_entry_set_icon_from_stock (GTK_ENTRY (entry),
 
514
                                            GTK_ENTRY_ICON_PRIMARY,
515
515
                                            GTK_STOCK_FIND);
516
516
        gtk_entry_set_placeholder_text (GTK_ENTRY (entry), "");
517
517
    }