← Back to branch summary

~ubuntu-branches/ubuntu/trusty/rhythmbox/trusty-proposed

« back to all changes in this revision

Viewing changes to plugins/dbus-media-server/rb-dbus-media-server-plugin.c

  • Committer: Package Import Robot
  • Author(s): Michael Biebl
  • Date: 2012-06-10 16:19:59 UTC
  • mto: (1.3.2)
  • mto: This revision was merged to the branch mainline in revision 32.
  • Revision ID: package-import@ubuntu.com-20120610161959-3wr8avyq3he0uz68
Tags: upstream-2.97
Import upstream version 2.97

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/dbus-media-server/rb-dbus-media-server-plugin.c
2297
2297
}
2298
2298
*/
2299
2299
 
2300
 
static gboolean
2301
 
display_page_inserted_cb (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, RBMediaServer2Plugin *plugin)
 
2300
static void
 
2301
display_page_inserted_cb (RBDisplayPageModel *model, RBDisplayPage *page, GtkTreeIter *iter, RBMediaServer2Plugin *plugin)
2302
2302
{
2303
 
        RBDisplayPage *page;
2304
2303
        GList *l;
2305
2304
 
2306
 
        gtk_tree_model_get (model, iter,
2307
 
                            RB_DISPLAY_PAGE_MODEL_COLUMN_PAGE, &page,
2308
 
                            -1);
2309
2305
        if (RB_IS_SOURCE (page)) {
2310
2306
                RBSource *source = RB_SOURCE (page);
2311
2307
                /* figure out if this is a source we can publish */
2324
2320
                }
2325
2321
        }
2326
2322
 
 
2323
}
 
2324
 
 
2325
static gboolean
 
2326
display_page_foreach_cb (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, RBMediaServer2Plugin *plugin)
 
2327
{
 
2328
        RBDisplayPage *page;
 
2329
 
 
2330
        gtk_tree_model_get (model, iter,
 
2331
                            RB_DISPLAY_PAGE_MODEL_COLUMN_PAGE, &page,
 
2332
                            -1);
 
2333
        display_page_inserted_cb (RB_DISPLAY_PAGE_MODEL (model), page, iter, plugin);
 
2334
 
2327
2335
        g_object_unref (page);
2328
2336
        return FALSE;
2329
2337
}
2394
2402
        g_object_unref (source);
2395
2403
 
2396
2404
        /* watch for user-creatable sources (playlists, devices) */
2397
 
        g_signal_connect_object (plugin->display_page_model, "row-inserted", G_CALLBACK (display_page_inserted_cb), plugin, 0);
 
2405
        g_signal_connect_object (plugin->display_page_model, "page-inserted", G_CALLBACK (display_page_inserted_cb), plugin, 0);
2398
2406
        gtk_tree_model_foreach (GTK_TREE_MODEL (plugin->display_page_model),
2399
 
                                (GtkTreeModelForeachFunc) display_page_inserted_cb,
 
2407
                                (GtkTreeModelForeachFunc) display_page_foreach_cb,
2400
2408
                                plugin);
2401
2409
        register_category_container (plugin, _("Playlists"), RB_MEDIASERVER2_PLAYLISTS, RB_MEDIASERVER2_ROOT, is_shareable_playlist);
2402
2410
        /* see comments above */