← Back to branch summary

~ubuntu-branches/ubuntu/lucid/epiphany-browser/lucid

« back to all changes in this revision

Viewing changes to embed/downloader-view.c

  • Committer: Bazaar Package Importer
  • Author(s): Josselin Mouette, Gustavo Noronha Silva, Josselin Mouette
  • Date: 2009-11-13 19:28:48 UTC
  • mfrom: (1.3.10 sid)
  • Revision ID: james.westby@ubuntu.com-20091113192848-l1ktaulwcdb1cd2i
Tags: 2.29.1-2
[ Gustavo Noronha Silva ]
* debian/patches/04_set_prgname.patch:
- New patch, to make sure GNOME Shell is able to match the application
  windows to the .desktop file, and app well favourite.

[ Josselin Mouette ]
* Add a conflict with swfdec-mozilla, the plugin makes the browser 
  completely unusable on any website with Flash content.

Show diffs side-by-side

added added

removed removed

Lines of Context:
embed/downloader-view.c
74
74
        NotifyNotification *notification;
75
75
#endif
76
76
 
77
 
        guint idle_unref : 1;
78
77
        guint source_id;
79
78
        guint notification_timeout;
80
79
};
222
221
        /* hide window already */
223
222
        gtk_widget_hide (priv->window);
224
223
 
225
 
        priv->idle_unref = FALSE;
226
 
 
227
224
        /* cancel pending downloads */
228
225
        g_hash_table_foreach_remove (priv->downloads_hash,
229
226
                                     (GHRFunc) remove_download, view);
237
234
static void
238
235
downloader_view_init (DownloaderView *dv)
239
236
{
240
 
        g_object_ref (embed_shell);
241
 
 
 
237
        _ephy_embed_shell_track_object (embed_shell, G_OBJECT (dv));
242
238
        dv->priv = EPHY_DOWNLOADER_VIEW_GET_PRIVATE (dv);
243
239
 
244
240
        dv->priv->downloads_hash = g_hash_table_new_full
245
241
                (g_direct_hash, g_direct_equal, NULL,
246
242
                 (GDestroyNotify)gtk_tree_row_reference_free);
247
 
        dv->priv->idle_unref = TRUE;
248
243
 
249
244
        downloader_view_build_ui (dv);
250
245
 
259
254
{
260
255
        DownloaderView *dv = EPHY_DOWNLOADER_VIEW (object);
261
256
        DownloaderViewPrivate *priv = dv->priv;
262
 
        gboolean idle_unref = dv->priv->idle_unref;
263
257
 
264
258
        if (priv->status_icon != NULL)
265
259
        {
286
280
        g_hash_table_destroy (dv->priv->downloads_hash);
287
281
 
288
282
        G_OBJECT_CLASS (downloader_view_parent_class)->finalize (object);
289
 
 
290
 
        if (idle_unref)
291
 
        {
292
 
                ephy_object_idle_unref (embed_shell);
293
 
        }
294
 
        else
295
 
        {
296
 
                g_object_unref (embed_shell);
297
 
        }
298
283
}
299
284
 
300
285
DownloaderView *