[Xfce4-commits] [xfce/xfce4-panel] 03/12: Fix some errors that happened during rebasing
noreply at xfce.org
noreply at xfce.org
Mon Feb 27 22:51:44 CET 2017
This is an automated email from the git hooks/post-receive script.
ochosi pushed a commit to branch master
in repository xfce/xfce4-panel.
commit 7fa3829e96194bdeb4ac641c24ce3f2930dcb0d3
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date: Mon Feb 27 00:27:07 2017 +0100
Fix some errors that happened during rebasing
---
panel/panel-application.c | 2 +-
panel/panel-window.c | 97 ++++++++++++++++++++++++++---------------------
2 files changed, 54 insertions(+), 45 deletions(-)
diff --git a/panel/panel-application.c b/panel/panel-application.c
index 2f3c7e7..d5b4451 100644
--- a/panel/panel-application.c
+++ b/panel/panel-application.c
@@ -288,7 +288,7 @@ panel_application_xfconf_window_bindings (PanelApplication *application,
const PanelProperty properties[] =
{
{ "position-locked", G_TYPE_BOOLEAN },
- { "autohide-behavior", G_TYPE_BOOLEAN },
+ { "autohide-behavior", G_TYPE_UINT },
{ "span-monitors", G_TYPE_BOOLEAN },
{ "mode", G_TYPE_UINT },
{ "size", G_TYPE_UINT },
diff --git a/panel/panel-window.c b/panel/panel-window.c
index aa55d05..bc279e7 100644
--- a/panel/panel-window.c
+++ b/panel/panel-window.c
@@ -74,6 +74,7 @@
typedef enum _StrutsEgde StrutsEgde;
+typedef enum _AutohideBehavior AutohideBehavior;
typedef enum _AutohideState AutohideState;
typedef enum _SnapPosition SnapPosition;
typedef enum _PluginProp PluginProp;
@@ -119,50 +120,58 @@ static void panel_window_get_preferred_width (GtkWidget *w
static void panel_window_get_preferred_height (GtkWidget *widget,
gint *minimum_height,
gint *natural_height);
-static void panel_window_get_preferred_width_for_height (GtkWidget *widget,
- gint height,
- gint *minimum_width,
- gint *natural_width);
-static void panel_window_get_preferred_height_for_width (GtkWidget *widget,
- gint width,
- gint *minimum_height,
- gint *natural_height);
-static void panel_window_size_allocate (GtkWidget *widget,
- GtkAllocation *alloc);
-static void panel_window_size_allocate_set_xy (PanelWindow *window,
- gint window_width,
- gint window_height,
- gint *return_x,
- gint *return_y);
-static void panel_window_screen_changed (GtkWidget *widget,
- GdkScreen *previous_screen);
-static void panel_window_style_set (GtkWidget *widget,
- GtkStyle *previous_style);
-static void panel_window_realize (GtkWidget *widget);
-static StrutsEgde panel_window_screen_struts_edge (PanelWindow *window);
-static void panel_window_screen_struts_set (PanelWindow *window);
-static void panel_window_screen_update_borders (PanelWindow *window);
-static SnapPosition panel_window_snap_position (PanelWindow *window);
-static void panel_window_display_layout_debug (GtkWidget *widget);
-static void panel_window_screen_layout_changed (GdkScreen *screen,
- PanelWindow *window);
-static void panel_window_autohide_queue (PanelWindow *window,
- AutohideState new_state);
-static void panel_window_set_autohide (PanelWindow *window,
- gboolean autohide);
-static void panel_window_menu_popup (PanelWindow *window,
- guint32 event_time,
- gboolean show_tic_tac_toe);
-static void panel_window_plugins_update (PanelWindow *window,
- PluginProp prop);
-static void panel_window_plugin_set_mode (GtkWidget *widget,
- gpointer user_data);
-static void panel_window_plugin_set_size (GtkWidget *widget,
- gpointer user_data);
-static void panel_window_plugin_set_nrows (GtkWidget *widget,
- gpointer user_data);
-static void panel_window_plugin_set_screen_position (GtkWidget *widget,
- gpointer user_data);
+static void panel_window_get_preferred_width_for_height (GtkWidget *widget,
+ gint height,
+ gint *minimum_width,
+ gint *natural_width);
+static void panel_window_get_preferred_height_for_width (GtkWidget *widget,
+ gint width,
+ gint *minimum_height,
+ gint *natural_height);
+static void panel_window_size_allocate (GtkWidget *widget,
+ GtkAllocation *alloc);
+static void panel_window_size_allocate_set_xy (PanelWindow *window,
+ gint window_width,
+ gint window_height,
+ gint *return_x,
+ gint *return_y);
+static void panel_window_screen_changed (GtkWidget *widget,
+ GdkScreen *previous_screen);
+static void panel_window_style_set (GtkWidget *widget,
+ GtkStyle *previous_style);
+static void panel_window_realize (GtkWidget *widget);
+static StrutsEgde panel_window_screen_struts_edge (PanelWindow *window);
+static void panel_window_screen_struts_set (PanelWindow *window);
+static void panel_window_screen_update_borders (PanelWindow *window);
+static SnapPosition panel_window_snap_position (PanelWindow *window);
+static void panel_window_display_layout_debug (GtkWidget *widget);
+static void panel_window_screen_layout_changed (GdkScreen *screen,
+ PanelWindow *window);
+static void panel_window_active_window_changed (WnckScreen *screen,
+ WnckWindow *previous_window,
+ PanelWindow *window);
+static void panel_window_active_window_geometry_changed (WnckWindow *active_window,
+ PanelWindow *window);
+static void panel_window_autohide_queue (PanelWindow *window,
+ AutohideState new_state);
+static void panel_window_set_autohide_behavior (PanelWindow *window,
+ gboolean autohide);
+static void panel_window_update_autohide_window (PanelWindow *window,
+ WnckScreen *screen,
+ WnckWindow *active_window);
+static void panel_window_menu_popup (PanelWindow *window,
+ guint32 event_time,
+ gboolean show_tic_tac_toe);
+static void panel_window_plugins_update (PanelWindow *window,
+ PluginProp prop);
+static void panel_window_plugin_set_mode (GtkWidget *widget,
+ gpointer user_data);
+static void panel_window_plugin_set_size (GtkWidget *widget,
+ gpointer user_data);
+static void panel_window_plugin_set_nrows (GtkWidget *widget,
+ gpointer user_data);
+static void panel_window_plugin_set_screen_position (GtkWidget *widget,
+ gpointer user_data);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list