← Back to branch summary

~midori/midori/trunk

« back to all changes in this revision

Viewing changes to midori/midori-locationaction.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-locationaction.c
945
945
    #if GTK_CHECK_VERSION (3, 6, 0)
946
946
    gtk_entry_set_input_purpose (GTK_ENTRY (entry), GTK_INPUT_PURPOSE_URL);
947
947
    #endif
948
 
    gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (entry),
949
 
         GTK_ICON_ENTRY_PRIMARY, TRUE);
950
 
    gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (entry),
951
 
         GTK_ICON_ENTRY_SECONDARY, TRUE);
 
948
    gtk_entry_set_icon_activatable (GTK_ENTRY (entry),
 
949
         GTK_ENTRY_ICON_PRIMARY, TRUE);
 
950
    gtk_entry_set_icon_activatable (GTK_ENTRY (entry),
 
951
         GTK_ENTRY_ICON_SECONDARY, TRUE);
952
952
 
953
953
    targetlist = gtk_target_list_new (NULL, 0);
954
954
    gtk_target_list_add_uri_targets (targetlist, 0);
1448
1448
    /* The dialog should "toggle" like a menu, as far as users go
1449
1449
       FIXME: Half-working: the dialog closes but re-opens */
1450
1450
    static GtkWidget* dialog = NULL;
1451
 
    if (icon_pos == GTK_ICON_ENTRY_PRIMARY && dialog != NULL)
 
1451
    if (icon_pos == GTK_ENTRY_ICON_PRIMARY && dialog != NULL)
1452
1452
        gtk_widget_destroy (dialog);
1453
1453
 
1454
 
    if (icon_pos == GTK_ICON_ENTRY_PRIMARY)
 
1454
    if (icon_pos == GTK_ENTRY_ICON_PRIMARY)
1455
1455
    {
1456
1456
        /* No "security" window for blank pages */
1457
1457
        if (midori_uri_is_blank (MIDORI_LOCATION_ACTION (action)->text))
1499
1499
        g_signal_connect (dialog, "destroy", G_CALLBACK (gtk_widget_destroyed), &dialog);
1500
1500
        gtk_widget_show_all (dialog);
1501
1501
    }
1502
 
    if (icon_pos == GTK_ICON_ENTRY_SECONDARY)
 
1502
    if (icon_pos == GTK_ENTRY_ICON_SECONDARY)
1503
1503
    {
1504
1504
        gboolean result;
1505
1505
        g_signal_emit (action, signals[SECONDARY_ICON_RELEASED], 0,
1731
1731
    {
1732
1732
        GtkWidget* entry = midori_location_action_entry_for_proxy (proxies->data);
1733
1733
        if (stock_id && gtk_stock_lookup (stock_id, &stock_item))
1734
 
            gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry),
1735
 
                GTK_ICON_ENTRY_SECONDARY, stock_id);
 
1734
            gtk_entry_set_icon_from_stock (GTK_ENTRY (entry),
 
1735
                GTK_ENTRY_ICON_SECONDARY, stock_id);
1736
1736
        else
1737
 
            gtk_icon_entry_set_icon_from_icon_name (GTK_ICON_ENTRY (entry),
1738
 
                GTK_ICON_ENTRY_SECONDARY, stock_id);
 
1737
            gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry),
 
1738
                GTK_ENTRY_ICON_SECONDARY, stock_id);
1739
1739
    }
1740
1740
}
1741
1741
 
1764
1764
    if (GTK_IS_TOOL_ITEM (proxies->data))
1765
1765
    {
1766
1766
        GtkWidget* entry = midori_location_action_entry_for_proxy (proxies->data);
1767
 
        gtk_entry_set_icon_from_gicon (GTK_ENTRY (entry), GTK_ICON_ENTRY_PRIMARY, icon);
1768
 
        gtk_icon_entry_set_tooltip (GTK_ICON_ENTRY (entry), GTK_ICON_ENTRY_PRIMARY, tooltip);
 
1767
        gtk_entry_set_icon_from_gicon (GTK_ENTRY (entry), GTK_ENTRY_ICON_PRIMARY, icon);
 
1768
        gtk_entry_set_icon_tooltip_text (GTK_ENTRY (entry), GTK_ENTRY_ICON_PRIMARY, tooltip);
1769
1769
    }
1770
1770
}
1771
1771