← Back to branch summary

~ubuntu-branches/ubuntu/trusty/nautilus/trusty

« back to all changes in this revision

Viewing changes to src/nautilus-application.c

  • Committer: Package Import Robot
  • Author(s): Marco Trevisan (Treviño)
  • Date: 2014-02-28 10:43:25 UTC
  • Revision ID: package-import@ubuntu.com-20140228104325-7t7bha2xqo4pkcpq
Tags: 1:3.10.1-0ubuntu7
https://launchpad.net/bugs/1285895
* debian/patches/19_unity_open_location_xid.patch:
  - don't try to call functions on null objects (lp: #1285895)
  - delay dbus registration until we don't have a bus

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/nautilus-application.c
1667
1667
        G_APPLICATION_CLASS (nautilus_application_parent_class)->quit_mainloop (app);
1668
1668
}
1669
1669
 
1670
 
static void
1671
 
update_dbus_opened_locations (NautilusApplication *app)
 
1670
void
 
1671
nautilus_application_update_dbus_opened_locations (NautilusApplication *app)
1672
1672
{
1673
1673
        gint i;
1674
1674
        GList *l, *sl;
1746
1746
                          const char         *to,
1747
1747
                          NautilusApplication *application)
1748
1748
{
1749
 
        update_dbus_opened_locations (application);
 
1749
        nautilus_application_update_dbus_opened_locations (application);
1750
1750
}
1751
1751
 
1752
1752
static void
1755
1755
               NautilusApplication *application)
1756
1756
{
1757
1757
        if (nautilus_window_slot_get_location (slot)) {
1758
 
                update_dbus_opened_locations (application);
 
1758
                nautilus_application_update_dbus_opened_locations (application);
1759
1759
        }
1760
1760
 
1761
1761
        g_signal_connect (slot, "location-changed", G_CALLBACK (on_slot_location_changed), application);
1766
1766
                 NautilusWindowSlot  *slot,
1767
1767
                 NautilusApplication *application)
1768
1768
{
1769
 
        update_dbus_opened_locations (application);
 
1769
        nautilus_application_update_dbus_opened_locations (application);
1770
1770
 
1771
1771
        g_signal_handlers_disconnect_by_func (slot, on_slot_location_changed, application);
1772
1772
}
1775
1775
on_realize (GtkWidget           *widget,
1776
1776
            NautilusApplication *application)
1777
1777
{
1778
 
        update_dbus_opened_locations (application);
 
1778
        nautilus_application_update_dbus_opened_locations (application);
1779
1779
}
1780
1780
 
1781
1781
static void