← Back to branch summary

~shnatsel/unity/old-school-dash

« back to all changes in this revision

Viewing changes to src/PlaceEntryRemote.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2011-04-14 22:03:42 UTC
  • mfrom: (1.1.41 upstream)
  • Revision ID: james.westby@ubuntu.com-20110414220342-4kp036kzlljxxx23
Tags: 3.8.8-0ubuntu1
https://launchpad.net/bugs/687660
https://launchpad.net/bugs/757709
https://launchpad.net/bugs/758307
https://launchpad.net/bugs/750155
https://launchpad.net/bugs/750471
https://launchpad.net/bugs/757362
https://launchpad.net/bugs/757663
https://launchpad.net/bugs/757810
https://launchpad.net/bugs/759682
https://launchpad.net/bugs/729074
https://launchpad.net/bugs/743149
https://launchpad.net/bugs/745555
https://launchpad.net/bugs/747304
https://launchpad.net/bugs/760003
https://launchpad.net/bugs/760770
https://launchpad.net/bugs/760728
https://launchpad.net/bugs/703067
https://launchpad.net/bugs/741804
https://launchpad.net/bugs/757588
https://launchpad.net/bugs/759763
https://launchpad.net/bugs/754689
https://launchpad.net/bugs/744795
https://launchpad.net/bugs/750374
https://launchpad.net/bugs/753083
* New upstream release.
  - Empty desktop after login (LP: #687660)
  - compiz crashed with SIGSEGV in nux::Area::InitiateResizeLayout()
    (LP: #757709)
  - compiz crashed on initial load of Java Citrix Client/Inkscape in
    PrivateWindow::processMap() (LP: #758307)
  - Sometimes dragging down from the panel just stops working (LP: #750155)
  - Ensure Unity prioritises icon loading from Unity-icon-theme
    (LP: #750471)
  - text truncated in Dash. Empty search from Applications or Files lense
    returns “Your search did not” due to cut off label (LP: #757362)
  - should list PlacesGroup.cpp in POTFILES.in (LP: #757663)
  - Launcher intellhide stuck after edge reveal (LP: #757810)
  - unity-preferences doesn't load translations (LP: #759682)
  - dynamic quicklists are not working (LP: #729074)
  - with second monitor, first monitor does not show nautilus
    application/global menu when displaying desktop (LP: #743149)
  - Launcher - The Workspace, File Lens, App Lens and Trash Launcher icons
    need to be rendered correctly (LP: #745555)
  - the launcher background gets dimmed after icons dnd (LP: #747304)
  - Numpad 'Enter' does not work on unity launcher when navigating through
    keyboard (LP: #760003)
  - Launcher shouldn't hover when being in the dash (LP: #760770)
  - Launcher displays key shortcuts while holding Super while the dash is
    open but the shortcuts are unfunctional (LP: #760728)
  - Running/active indicators point to space between launcher icons for
    folded icons (LP: #703067)
  - user-trash.svg and user-trash-full.svg not lens grayscale versions
    (LP: #741804)
  - code-cleanup: unregistered any established ubus-interests (LP: #757588)
  - dropdown box in places search bar does not resize when font size changes
    (LP: #759763)
  - [FFE] Centered layout for expo plugin (LP: #754689)
  - Unity launcher icons tooltips do not disappear when swiching workspaces
    (LP: #744795)
  - Dash - Update Dash scroll bar (LP: #750374)
  - Letters cut off at the end in the applications window  (LP: #753083)
* debian/control:
  - build-dep on grail/geis with version bumped
* 01_dont_dep_on_latest_geis_grail.patch:
  - not needed anymore

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/PlaceEntryRemote.cpp
203
203
  _global_results_model (NULL),
204
204
  _global_groups_model (NULL),
205
205
  _previous_search (NULL),
206
 
  _previous_section (G_MAXUINT32)
 
206
  _previous_section (G_MAXUINT32),
 
207
  _conn_attempt (false)
207
208
{
208
209
  _dbus_name = g_strdup (dbus_name);
209
210
}
303
304
 
304
305
  _valid = true;
305
306
 
306
 
  Connect ();
307
 
 
308
307
  g_debug ("PlaceEntry: %s", _name);
309
308
 
310
309
  g_free (name);
463
462
{
464
463
  GVariantBuilder *builder;
465
464
 
 
465
  // This is valid for a certain case with global search
 
466
  if (!G_IS_DBUS_PROXY (_proxy))
 
467
    return;
 
468
 
466
469
  builder = g_variant_builder_new (G_VARIANT_TYPE ("a{ss}"));
467
470
 
468
471
  /* FIXME: I'm ignoring hints because we don't use them currently */
850
853
void
851
854
PlaceEntryRemote::Connect ()
852
855
{
853
 
  g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
854
 
                            G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
855
 
                            NULL,
856
 
                            _dbus_name,
857
 
                            _dbus_path,
858
 
                            PLACE_ENTRY_IFACE,
859
 
                            NULL,
860
 
                            on_proxy_ready,
861
 
                            this);
 
856
  if (!_conn_attempt && !G_IS_DBUS_PROXY (_proxy))
 
857
  {
 
858
    g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
 
859
                              G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
 
860
                              NULL,
 
861
                              _dbus_name,
 
862
                              _dbus_path,
 
863
                              PLACE_ENTRY_IFACE,
 
864
                              NULL,
 
865
                              on_proxy_ready,
 
866
                              this);
 
867
    _conn_attempt = true;
 
868
  }
862
869
}
863
870
 
864
871
void
869
876
 
870
877
  _proxy = g_dbus_proxy_new_for_bus_finish (result, &error);
871
878
  name_owner = g_dbus_proxy_get_name_owner (_proxy);
 
879
  _conn_attempt = false;
872
880
 
873
881
  if (error || !name_owner)
874
882
  {
886
894
 
887
895
  g_signal_connect (_proxy, "g-signal",
888
896
                    G_CALLBACK (on_proxy_signal_received), this);
 
897
  g_signal_connect (_proxy, "notify::g-name-owner",
 
898
                    G_CALLBACK (PlaceEntryRemote::OnProxyNameOwnerChanged), this);
889
899
 
890
900
  g_free (name_owner);
891
901
}
892
902
 
893
903
void
 
904
PlaceEntryRemote::OnProxyNameOwnerChanged (GDBusProxy       *proxy,
 
905
                                           GParamSpec       *pspec,
 
906
                                           PlaceEntryRemote *self)
 
907
{
 
908
  gchar *name_owner  = g_dbus_proxy_get_name_owner (proxy);
 
909
 
 
910
  if (!name_owner)
 
911
  {
 
912
    // Remote proxy has died
 
913
    g_debug ("Remote PlaceEntryRemote proxy %s no longer exists, reconnecting", self->_dbus_path);
 
914
    g_object_unref (self->_proxy);
 
915
    self->_proxy = NULL;
 
916
 
 
917
    self->Connect ();
 
918
  }
 
919
  else
 
920
    g_free (name_owner);
 
921
}
 
922
 
 
923
void
894
924
PlaceEntryRemote::OnGroupAdded  (DeeModel *model, DeeModelIter *iter, PlaceEntryRemote *self)
895
925
{
896
926
  PlaceEntryGroupRemote group (model, iter);