[Xfce4-commits] [panel-plugins/xfce4-places-plugin] 24/30: Fix builds with debug=full
noreply at xfce.org
noreply at xfce.org
Mon Apr 22 12:08:15 CEST 2019
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 6ca451962bf0c3d18fef7ac3df937c4e2a88b9dd
Author: Sean Davis <smd.seandavis at gmail.com>
Date: Sun Apr 21 10:53:32 2019 -0400
Fix builds with debug=full
---
panel-plugin/button.c | 2 +-
panel-plugin/model_user.c | 1 -
panel-plugin/model_volumes.c | 26 +++++++++++++-------------
panel-plugin/view.c | 4 ++--
4 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/panel-plugin/button.c b/panel-plugin/button.c
index 75e4c86..692ecee 100644
--- a/panel-plugin/button.c
+++ b/panel-plugin/button.c
@@ -412,10 +412,10 @@ places_button_resize(PlacesButton *self)
{
gboolean show_image, show_label;
gint new_size, image_size;
- gint border_thickness;
#if LIBXFCE4PANEL_CHECK_VERSION(4, 13, 0)
#else
GtkStyle *style;
+ gint border_thickness;
#endif
gboolean vertical = FALSE;
gboolean deskbar = FALSE;
diff --git a/panel-plugin/model_user.c b/panel-plugin/model_user.c
index 47fd15a..40cba9f 100644
--- a/panel-plugin/model_user.c
+++ b/panel-plugin/model_user.c
@@ -210,7 +210,6 @@ pbuser_build_bookmarks(PlacesBookmarkGroup *bookmark_group)
const gchar *p;
const gchar *path;
gchar *hostname;
- gchar *display_name = NULL;
const gchar *skip;
const gchar *firstdot;
const gchar skip_chars[] = ":@";
diff --git a/panel-plugin/model_volumes.c b/panel-plugin/model_volumes.c
index 7518c19..afd7d1a 100644
--- a/panel-plugin/model_volumes.c
+++ b/panel-plugin/model_volumes.c
@@ -32,7 +32,7 @@
#include <gio/gunixmounts.h>
#endif
#include <gtk/gtk.h>
-
+
#ifdef HAVE_LIBNOTIFY
#include "model_volumes_notify.h"
#endif
@@ -147,7 +147,7 @@ pbvol_unmount(PlacesBookmarkAction *action)
#endif
g_mount_unmount_with_operation(mount, G_MOUNT_UNMOUNT_NONE, NULL,
NULL,
- pbvol_unmount_finish,
+ pbvol_unmount_finish,
g_object_ref(volume));
}
}
@@ -227,7 +227,7 @@ pbvol_mount(PlacesBookmarkAction *action)
GMountOperation *operation = gtk_mount_operation_new(NULL);
g_volume_mount(volume, G_MOUNT_MOUNT_NONE, operation, NULL,
- pbvol_mount_finish,
+ pbvol_mount_finish,
g_object_ref(volume));
g_object_unref(operation);
@@ -241,7 +241,7 @@ pbvol_mount_and_open(PlacesBookmarkAction *action)
GMount *mount;
DBG("Mount and open");
-
+
g_return_if_fail(G_IS_VOLUME(action->priv));
volume = G_VOLUME(action->priv);
mount = g_volume_get_mount(volume);
@@ -296,7 +296,7 @@ pbvol_mount_is_internal (GMount *mount)
if (!g_unix_mount_point_is_user_mountable(lp->data))
is_internal = TRUE;
}
-
+
/* free the mount point, we no longer need it */
g_unix_mount_point_free(lp->data);
}
@@ -386,14 +386,14 @@ pbvol_is_present(GVolume *volume)
static inline 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);
- return pbvol_is_removable(volume) &&
+ return pbvol_is_removable(volume) &&
pbvol_is_present(volume);
}
@@ -531,7 +531,7 @@ pbvol_get_bookmarks(PlacesBookmarkGroup *bookmark_group)
volumes = volumes->next;
}
-
+
pbg_priv(bookmark_group)->changed = FALSE;
return g_list_reverse(bookmarks);
@@ -548,7 +548,7 @@ static void
pbvol_finalize(PlacesBookmarkGroup *bookmark_group)
{
const GList *volumes;
-
+
volumes = g_volume_monitor_get_volumes(pbg_priv(bookmark_group)->volume_monitor);
while(volumes != NULL){
g_signal_handlers_disconnect_by_func(G_VOLUME(volumes->data),
@@ -563,7 +563,7 @@ pbvol_finalize(PlacesBookmarkGroup *bookmark_group)
g_object_unref(pbg_priv(bookmark_group)->volume_monitor);
pbg_priv(bookmark_group)->volume_monitor = NULL;
-
+
g_free(pbg_priv(bookmark_group));
bookmark_group->priv = NULL;
}
@@ -583,7 +583,7 @@ places_bookmarks_volumes_create(gboolean mount_and_open_by_default)
pbg_priv(bookmark_group)->volume_monitor = g_volume_monitor_get();
pbg_priv(bookmark_group)->changed = TRUE;
pbg_priv(bookmark_group)->mount_and_open_by_default = mount_and_open_by_default;
-
+
volumes = g_volume_monitor_get_volumes(pbg_priv(bookmark_group)->volume_monitor);
while(volumes != NULL) {
g_signal_connect_swapped(G_OBJECT(volumes->data), "changed",
diff --git a/panel-plugin/view.c b/panel-plugin/view.c
index 9f95ca0..add0264 100644
--- a/panel-plugin/view.c
+++ b/panel-plugin/view.c
@@ -751,7 +751,7 @@ pview_open_menu_at (PlacesView *pd,
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pd->button), TRUE);
/* popup menu */
- DBG("menu: %x", (guint)pd->menu);
+ DBG("menu: %lu", (gulong)pd->menu);
if (button == NULL)
open_menu_at_pointer (GTK_MENU (pd->menu));
else
@@ -841,7 +841,7 @@ pview_remote_event(XfcePanelPlugin *panel_plugin,
{
g_return_val_if_fail (value == NULL || G_IS_VALUE (value), FALSE);
- DBG("remote event: %s, %x", name, (guint) view);
+ DBG("remote event: %s, %lu", name, (gulong) view);
if (strcmp (name, "popup") == 0
&& gtk_widget_is_visible (GTK_WIDGET (panel_plugin))
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list