← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/midori/oneiric-updates

« back to all changes in this revision

Viewing changes to toolbars/midori-transferbar.c

  • Committer: Bazaar Package Importer
  • Author(s): Yves-Alexis Perez
  • Date: 2011-08-02 09:44:09 UTC
  • mfrom: (1.1.17 upstream) (3.3.11 sid)
  • Revision ID: james.westby@ubuntu.com-20110802094409-b0eekdkttqs5a528
Tags: 0.4.0-1
* New upstream release.
* debian/control:
  - bump webkit build-dep to 1.1.17.
  - bump valac build-dep to 0.10.

Show diffs side-by-side

added added

removed removed

Lines of Context:
toolbars/midori-transferbar.c
37
37
    /* Nothing to do */
38
38
}
39
39
 
40
 
#if WEBKIT_CHECK_VERSION (1, 1, 3)
41
40
typedef struct
42
41
{
43
42
    WebKitDownload* download;
112
111
        case WEBKIT_DOWNLOAD_STATUS_FINISHED:
113
112
        {
114
113
            MidoriBrowser* browser = midori_browser_get_for_widget (button);
115
 
            #if WEBKIT_CHECK_VERSION (1, 1, 14)
116
114
            WebKitNetworkRequest* request;
117
 
            #endif
118
115
            const gchar* original_uri;
119
116
            gchar** fingerprint;
120
117
 
137
134
            }
138
135
 
139
136
            /* Link Fingerprint */
140
 
            #if WEBKIT_CHECK_VERSION (1, 1, 14)
141
137
            request = webkit_download_get_network_request (download);
142
138
            original_uri = g_object_get_data (G_OBJECT (request), "midori-original-uri");
143
139
            if (!original_uri)
144
 
            #endif
145
140
                original_uri = webkit_download_get_uri (download);
146
141
            fingerprint = g_strsplit (original_uri, "#!md5!", 2);
147
142
            if (fingerprint && fingerprint[0] && fingerprint[1])
315
310
        }
316
311
    }
317
312
}
318
 
#endif
319
313
 
320
314
static void
321
315
midori_transferbar_init (MidoriTransferbar* transferbar)
326
320
    transferbar->clear = gtk_tool_button_new_from_stock (GTK_STOCK_CLEAR);
327
321
    gtk_tool_button_set_label (GTK_TOOL_BUTTON (transferbar->clear), _("Clear All"));
328
322
    gtk_tool_item_set_is_important (transferbar->clear, TRUE);
329
 
    #if WEBKIT_CHECK_VERSION (1, 1, 3)
330
323
    g_signal_connect (transferbar->clear, "clicked",
331
324
        G_CALLBACK (midori_transferbar_clear_clicked_cb), transferbar);
332
 
    #endif
333
325
    gtk_toolbar_insert (GTK_TOOLBAR (transferbar), transferbar->clear, -1);
334
326
 
335
327
    transferbar->infos = NULL;
340
332
{
341
333
    GtkWidget* dialog = NULL;
342
334
    gboolean cancel = FALSE;
343
 
    #if WEBKIT_CHECK_VERSION (1, 1, 3)
344
335
    GList* list;
345
336
    gboolean all_done = TRUE;
346
337
 
359
350
    }
360
351
 
361
352
    if (!all_done)
362
 
    #else
363
 
    if (transferbar->infos || g_list_nth_data (transferbar->infos, 0))
364
 
    #endif
365
353
    {
366
354
        GtkWidget* widget = gtk_widget_get_toplevel (GTK_WIDGET (transferbar));
367
355
        dialog = gtk_message_dialog_new (GTK_WINDOW (widget),