diff options
| -rw-r--r-- | libmdock/mdock-widget.c | 9 | ||||
| -rw-r--r-- | mate-applet/mdock-mate-panel-applet.c | 3 | ||||
| -rw-r--r-- | test/mdock-standalone.c | 1 |
3 files changed, 8 insertions, 5 deletions
diff --git a/libmdock/mdock-widget.c b/libmdock/mdock-widget.c index 74467a3..f336a62 100644 --- a/libmdock/mdock-widget.c +++ b/libmdock/mdock-widget.c @@ -49,8 +49,8 @@ struct _MDockWidgetPrivate MDockItem *current_pointed_item; MDockItem *current_popup_item; guint popup_timer; - gboolean loading_settings : 1; - gboolean primary_button_down : 1; + gboolean loading_settings; + gboolean primary_button_down; }; G_DEFINE_TYPE(MDockWidget, mdock_widget, GTK_TYPE_BOX) @@ -75,8 +75,8 @@ enum { }; static const GtkTargetEntry drag_types[] = { - "application/x-mdock-item", 0, DRAG_TYPE_ITEM, - "text/uri-list", 0, DRAG_TYPE_URILIST + {"application/x-mdock-item", 0, DRAG_TYPE_ITEM}, + {"text/uri-list", 0, DRAG_TYPE_URILIST} }; static void connect_item(MDockWidget *self, MDockItem *item, GSequenceIter *position); @@ -404,7 +404,6 @@ static void mdock_widget_drag_data_received(GtkWidget *widget, GdkDragContext *c static gboolean mdock_widget_drag_drop(GtkWidget *widget, GdkDragContext *context, gint x, gint y, guint timestamp) { - MDockWidget *self = MDOCK_WIDGET(widget); GtkTargetList *target_list = gtk_drag_dest_get_target_list(widget); GdkAtom target = gtk_drag_dest_find_target(widget, context, target_list); guint info; diff --git a/mate-applet/mdock-mate-panel-applet.c b/mate-applet/mdock-mate-panel-applet.c index 404c7f7..63581f4 100644 --- a/mate-applet/mdock-mate-panel-applet.c +++ b/mate-applet/mdock-mate-panel-applet.c @@ -71,13 +71,16 @@ static gboolean transform_applet_orient_to_orientation(GBinding *binding, const { MatePanelAppletOrient orient = g_value_get_uint(from_value); g_value_set_enum(to_value, applet_orient_to_orientation(orient)); + return TRUE; } static gboolean transform_prefs_path_to_gsettings(GBinding *binding, const GValue *from_value, GValue *to_value, gpointer user_data) { const gchar *prefs_path = g_value_get_string(from_value); GSettings *settings = g_settings_new_with_path(MDOCK_WIDGET_GSETTINGS_SCHEMA, prefs_path); + g_return_val_if_fail(settings, FALSE); g_value_take_object(to_value, settings); + return TRUE; } static GtkOrientation mdock_mate_panel_applet_get_orientation(MDockMatePanelApplet *self) diff --git a/test/mdock-standalone.c b/test/mdock-standalone.c index 38a1ebd..e8fa96b 100644 --- a/test/mdock-standalone.c +++ b/test/mdock-standalone.c @@ -19,6 +19,7 @@ #include "../config.h" #include <stdlib.h> +#include <locale.h> #include <glib/gi18n.h> #include <gtk/gtk.h> #include "../libmdock/mdock-widget.h" |