← Back to branch summary

~midori/midori/trunk

« back to all changes in this revision

Viewing changes to midori/sokoke.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/sokoke.c
1096
1096
    const gchar* text = gtk_entry_get_text (entry);
1097
1097
    gboolean visible = text && *text
1098
1098
      && ! sokoke_entry_has_placeholder_text (entry);
1099
 
    gtk_icon_entry_set_icon_from_stock (
1100
 
        GTK_ICON_ENTRY (entry),
1101
 
        GTK_ICON_ENTRY_SECONDARY,
 
1099
    gtk_entry_set_icon_from_stock (
 
1100
        entry, GTK_ENTRY_ICON_SECONDARY,
1102
1101
        visible ? GTK_STOCK_CLEAR : NULL);
1103
1102
}
1104
1103
 
1113
1112
 
1114
1113
static void
1115
1114
sokoke_entry_icon_released_cb (GtkEntry*            entry,
1116
 
                               GtkIconEntryPosition icon_pos,
 
1115
                               GtkEntryIconPosition icon_pos,
1117
1116
                               GdkEvent*            event,
1118
1117
                               gpointer             user_data)
1119
1118
{
1120
 
    if (icon_pos != GTK_ICON_ENTRY_SECONDARY)
 
1119
    if (icon_pos != GTK_ENTRY_ICON_SECONDARY)
1121
1120
        return;
1122
1121
 
1123
1122
    gtk_entry_set_text (entry, "");
1131
1130
    gtk_entry_set_placeholder_text (GTK_ENTRY (entry), placeholder_text);
1132
1131
    gtk_entry_set_icon_from_stock (GTK_ENTRY (entry),
1133
1132
                                   GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_FIND);
1134
 
    gtk_icon_entry_set_icon_highlight (GTK_ENTRY (entry),
 
1133
    gtk_entry_set_icon_activatable (GTK_ENTRY (entry),
1135
1134
        GTK_ENTRY_ICON_SECONDARY, TRUE);
1136
1135
    {
1137
1136
        g_object_connect (entry,