[Xfce4-commits] [panel-plugins/xfce4-places-plugin] 26/30: Merge branch 'master' into bluesabre-review

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

b   l   u   e   s   a   b   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository panel-plugins/xfce4-places-plugin.

commit 22d4a5fbcf144596e98f3f5131612ff32bde7a0a
Merge: 34a424a a5daf60
Author: Sean Davis <bluesabre at users.noreply.github.com>
Date:   Sun Apr 21 12:12:21 2019 -0400

    Merge branch 'master' into bluesabre-review

 panel-plugin/button.c        |  13 +--
 panel-plugin/button.h        |   1 -
 panel-plugin/cfg.c           | 270 ++++++++++++++++++++++---------------------
 panel-plugin/cfg.h           |   2 -
 panel-plugin/model_user.c    |   1 -
 panel-plugin/model_volumes.c |  26 ++---
 panel-plugin/view.c          | 209 +++++++++++++--------------------
 panel-plugin/view.h          |   2 -
 8 files changed, 236 insertions(+), 288 deletions(-)

diff --cc panel-plugin/model_volumes.c
index 0948471,afd7d1a..719cce6
--- a/panel-plugin/model_volumes.c
+++ b/panel-plugin/model_volumes.c
@@@ -383,12 -383,12 +383,12 @@@ pbvol_is_present(GVolume *volume
      return has_media && !is_shadowed;
  }
  
 -static inline gboolean
 +static gboolean
  pbvol_show_volume(GVolume *volume){
      GMount *mount = g_volume_get_mount(volume);
-     DBG("Volume: %s [mounted=%x removable=%x present=%x]", g_volume_get_name(volume), 
-                                                            (guint) mount,
-                                                            pbvol_is_removable(volume), 
+     DBG("Volume: %s [mounted=%lu removable=%x present=%x]", g_volume_get_name(volume),
+                                                            (gulong) mount,
+                                                            pbvol_is_removable(volume),
                                                             pbvol_is_present(volume));
      if (mount)
         g_object_unref(mount);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.