← Back to branch summary

~midori/midori/trunk

« back to all changes in this revision

Viewing changes to toolbars/midori-findbar.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:
toolbars/midori-findbar.c
46
46
 
47
47
static void
48
48
midori_findbar_set_icon (MidoriFindbar*       findbar,
49
 
                         GtkIconEntryPosition icon_pos,
 
49
                         GtkEntryIconPosition icon_pos,
50
50
                         const gchar*         icon_name)
51
51
{
52
52
    if (icon_name != NULL)
57
57
        g_free (symbolic_icon_name);
58
58
    }
59
59
    else
60
 
        gtk_icon_entry_set_icon_from_icon_name (GTK_ICON_ENTRY (findbar->find_text),
 
60
        gtk_entry_set_icon_from_icon_name (GTK_ENTRY (findbar->find_text),
61
61
                                                icon_pos, NULL);
62
62
}
63
63
 
146
146
        gtk_widget_grab_focus (GTK_WIDGET (findbar->find_text));
147
147
    else
148
148
    {
149
 
        midori_findbar_set_icon (findbar, GTK_ICON_ENTRY_PRIMARY, STOCK_EDIT_FIND);
 
149
        midori_findbar_set_icon (findbar, GTK_ENTRY_ICON_PRIMARY, STOCK_EDIT_FIND);
150
150
        gtk_widget_show (GTK_WIDGET (findbar->find_case));
151
151
        gtk_widget_show (GTK_WIDGET (findbar->find_close));
152
152
        if (selected_text != NULL)
188
188
    if (g_utf8_strlen (preedit, -1) >= 1)
189
189
    {
190
190
        gboolean case_sensitive = midori_findbar_case_sensitive (findbar);
191
 
        midori_findbar_set_icon (findbar, GTK_ICON_ENTRY_SECONDARY, STOCK_EDIT_CLEAR);
 
191
        midori_findbar_set_icon (findbar, GTK_ENTRY_ICON_SECONDARY, STOCK_EDIT_CLEAR);
192
192
        midori_tab_find (MIDORI_TAB (view), preedit, case_sensitive, TRUE);
193
193
    }
194
194
    else
195
 
        midori_findbar_set_icon (findbar, GTK_ICON_ENTRY_SECONDARY, NULL);
 
195
        midori_findbar_set_icon (findbar, GTK_ENTRY_ICON_SECONDARY, NULL);
196
196
}
197
197
 
198
198
static void
292
292
    const gchar* text;
293
293
    gboolean case_sensitive;
294
294
 
295
 
    midori_findbar_set_icon (findbar, GTK_ICON_ENTRY_PRIMARY, found ? STOCK_EDIT_FIND : STOCK_STOP);
 
295
    midori_findbar_set_icon (findbar, GTK_ENTRY_ICON_PRIMARY, found ? STOCK_EDIT_FIND : STOCK_STOP);
296
296
 
297
297
    if (typing)
298
298
    {