diff options
author | rbuj <[email protected]> | 2019-06-16 13:21:30 +0200 |
---|---|---|
committer | raveit65 <[email protected]> | 2019-06-18 10:07:19 +0200 |
commit | 66368a189dea7ab666cb4089ee30b6ba04ba5132 (patch) | |
tree | 3d62c86143e83d6190578c20d2fe9714746b8eb5 /libwindow-settings | |
parent | 5caf5bd5aa799c35050c728f72617ad6b03fb0d7 (diff) | |
download | mate-control-center-66368a189dea7ab666cb4089ee30b6ba04ba5132.tar.bz2 mate-control-center-66368a189dea7ab666cb4089ee30b6ba04ba5132.tar.xz |
Remove trailing whitespaces
find . -regextype posix-extended -regex '.*\.(c|h|ac)' -exec sed --in-place 's/[[:space:]]\+$//' {} \+
Diffstat (limited to 'libwindow-settings')
-rw-r--r-- | libwindow-settings/marco-window-manager.c | 48 | ||||
-rw-r--r-- | libwindow-settings/mate-window-manager.c | 30 |
2 files changed, 39 insertions, 39 deletions
diff --git a/libwindow-settings/marco-window-manager.c b/libwindow-settings/marco-window-manager.c index 489d210d..d5f0d840 100644 --- a/libwindow-settings/marco-window-manager.c +++ b/libwindow-settings/marco-window-manager.c @@ -95,7 +95,7 @@ window_manager_new (int expected_interface_version) g_warning ("Marco window manager module wasn't compiled with the current version of mate-control-center"); return NULL; } - + wm = g_object_new (marco_window_manager_get_type (), NULL); return wm; @@ -119,7 +119,7 @@ add_themes_from_dir (GList *current_list, const char *path) * only checks existence, not wether we can really read it.*/ if (theme_dir == NULL) return current_list; - + for (entry = readdir (theme_dir); entry != NULL; entry = readdir (theme_dir)) { theme_file_path = g_build_filename (path, entry->d_name, "metacity-1/metacity-theme-2.xml", NULL); @@ -153,13 +153,13 @@ add_themes_from_dir (GList *current_list, const char *path) /*g_free (entry);*/ g_free (theme_file_path); } - + closedir (theme_dir); return current_list; } -static GList * +static GList * marco_get_theme_list (MateWindowManager *wm) { GList *themes = NULL; @@ -210,7 +210,7 @@ marco_change_settings (MateWindowManager *wm, g_settings_set_boolean (meta_wm->p->settings, MARCO_AUTORAISE_KEY, settings->autoraise); - + if (settings->flags & MATE_WM_SETTING_AUTORAISE_DELAY) g_settings_set_int (meta_wm->p->settings, MARCO_AUTORAISE_DELAY_KEY, @@ -221,7 +221,7 @@ marco_change_settings (MateWindowManager *wm, MARCO_FONT_KEY, settings->font); } - + if (settings->flags & MATE_WM_SETTING_MOUSE_MOVE_MODIFIER) { char *value; @@ -253,22 +253,22 @@ marco_get_settings (MateWindowManager *wm, MarcoWindowManager *meta_wm; meta_wm = MARCO_WINDOW_MANAGER (wm); - + to_get = settings->flags; settings->flags = 0; - + if (to_get & MATE_WM_SETTING_COMPOSITING_MANAGER) { settings->compositing_manager = g_settings_get_boolean (meta_wm->p->settings, MARCO_COMPOSITING_MANAGER_KEY); settings->flags |= MATE_WM_SETTING_COMPOSITING_MANAGER; } - + if (to_get & MATE_WM_SETTING_COMPOSITING_ALTTAB) { settings->compositing_fast_alt_tab = g_settings_get_boolean (meta_wm->p->settings, MARCO_COMPOSITING_FAST_ALT_TAB_KEY); settings->flags |= MATE_WM_SETTING_COMPOSITING_ALTTAB; } - + if (to_get & MATE_WM_SETTING_MOUSE_FOCUS) { gint marco_focus_value; @@ -280,13 +280,13 @@ marco_get_settings (MateWindowManager *wm, settings->flags |= MATE_WM_SETTING_MOUSE_FOCUS; } - + if (to_get & MATE_WM_SETTING_AUTORAISE) { settings->autoraise = g_settings_get_boolean (meta_wm->p->settings, MARCO_AUTORAISE_KEY); settings->flags |= MATE_WM_SETTING_AUTORAISE; } - + if (to_get & MATE_WM_SETTING_AUTORAISE_DELAY) { settings->autoraise_delay = g_settings_get_int (meta_wm->p->settings, @@ -310,12 +310,12 @@ marco_get_settings (MateWindowManager *wm, g_free (meta_wm->p->font); meta_wm->p->font = str; } - + settings->font = meta_wm->p->font; settings->flags |= MATE_WM_SETTING_FONT; } - + if (to_get & MATE_WM_SETTING_MOUSE_MOVE_MODIFIER) { char *str; const char *new; @@ -350,7 +350,7 @@ marco_get_settings (MateWindowManager *wm, g_free (str); settings->mouse_move_modifier = meta_wm->p->mouse_modifier; - + settings->flags |= MATE_WM_SETTING_MOUSE_MOVE_MODIFIER; } @@ -374,7 +374,7 @@ marco_get_settings (MateWindowManager *wm, settings->double_click_action = g_settings_get_enum (meta_wm->p->settings, MARCO_DOUBLE_CLICK_TITLEBAR_KEY); - + settings->flags |= MATE_WM_SETTING_DOUBLE_CLICK_ACTION; } } @@ -398,12 +398,12 @@ marco_get_double_click_actions (MateWindowManager *wm, { ACTION_TITLEBAR_MINIMIZE, N_("Minimize") }, { ACTION_TITLEBAR_NONE, N_("None") } }; - + static gboolean initialized = FALSE; if (!initialized) { int i; - + initialized = TRUE; for (i = 0; i < G_N_ELEMENTS (actions); i++) { actions[i].human_readable_name = _(actions[i].human_readable_name); @@ -411,7 +411,7 @@ marco_get_double_click_actions (MateWindowManager *wm, } *actions_p = actions; - *n_actions_p = (int) G_N_ELEMENTS (actions); + *n_actions_p = (int) G_N_ELEMENTS (actions); } static void @@ -430,7 +430,7 @@ marco_window_manager_init (MarcoWindowManager *marco_window_manager, } static void -marco_window_manager_finalize (GObject *object) +marco_window_manager_finalize (GObject *object) { MarcoWindowManager *marco_window_manager; @@ -447,7 +447,7 @@ marco_window_manager_finalize (GObject *object) static void -marco_window_manager_class_init (MarcoWindowManagerClass *class) +marco_window_manager_class_init (MarcoWindowManagerClass *class) { GObjectClass *object_class; MateWindowManagerClass *wm_class; @@ -463,7 +463,7 @@ marco_window_manager_class_init (MarcoWindowManagerClass *class) wm_class->get_user_theme_folder = marco_get_user_theme_folder; wm_class->get_theme_list = marco_get_theme_list; wm_class->get_double_click_actions = marco_get_double_click_actions; - + parent_class = g_type_class_peek_parent (class); } @@ -486,8 +486,8 @@ marco_window_manager_get_type (void) NULL }; - marco_window_manager_type = - g_type_register_static (mate_window_manager_get_type (), + marco_window_manager_type = + g_type_register_static (mate_window_manager_get_type (), "MarcoWindowManager", &marco_window_manager_info, 0); } diff --git a/libwindow-settings/mate-window-manager.c b/libwindow-settings/mate-window-manager.c index d6369c88..c7bbd24a 100644 --- a/libwindow-settings/mate-window-manager.c +++ b/libwindow-settings/mate-window-manager.c @@ -57,8 +57,8 @@ mate_window_manager_new (MateDesktopItem *it) } success = g_module_symbol (module, "window_manager_new", - (gpointer *) &wm_new_func); - + (gpointer *) &wm_new_func); + if ((!success) || wm_new_func == NULL) { g_warning ("Couldn't load window manager settings module `%s`, couldn't find symbol \'window_manager_new\'", module_name); g_free (module_name); @@ -71,14 +71,14 @@ mate_window_manager_new (MateDesktopItem *it) if (wm == NULL) return NULL; - + (MATE_WINDOW_MANAGER (wm))->p->window_manager_name = g_strdup (mate_desktop_item_get_string (it, MATE_DESKTOP_ITEM_NAME)); (MATE_WINDOW_MANAGER (wm))->p->ditem = mate_desktop_item_ref (it); - + return wm; } -const char * +const char * mate_window_manager_get_name (MateWindowManager *wm) { return wm->p->window_manager_name; @@ -119,7 +119,7 @@ mate_window_manager_get_double_click_actions (MateWindowManager *wm *actions = NULL; *n_actions = 0; - + if (klass->get_double_click_actions) klass->get_double_click_actions (wm, actions, n_actions); } @@ -129,7 +129,7 @@ mate_window_manager_change_settings (MateWindowManager *wm, const MateWMSettings *settings) { MateWindowManagerClass *klass = MATE_WINDOW_MANAGER_GET_CLASS (wm); - + (* klass->change_settings) (wm, settings); } @@ -145,7 +145,7 @@ mate_window_manager_get_settings (MateWindowManager *wm, * fields to the caller that the WM module * doesn't know about */ - + (* klass->get_settings) (wm, settings); } @@ -156,7 +156,7 @@ mate_window_manager_init (MateWindowManager *mate_window_manager, MateWindowMana } static void -mate_window_manager_finalize (GObject *object) +mate_window_manager_finalize (GObject *object) { MateWindowManager *mate_window_manager; @@ -178,17 +178,17 @@ enum { static guint signals[LAST_SIGNAL] = { 0 }; static void -mate_window_manager_class_init (MateWindowManagerClass *class) +mate_window_manager_class_init (MateWindowManagerClass *class) { GObjectClass *object_class; object_class = G_OBJECT_CLASS (class); object_class->finalize = mate_window_manager_finalize; - + parent_class = g_type_class_peek_parent (class); - + signals[SETTINGS_CHANGED] = g_signal_new ("settings_changed", G_OBJECT_CLASS_TYPE (class), @@ -219,10 +219,10 @@ mate_window_manager_get_type (void) NULL }; - mate_window_manager_type = - g_type_register_static (G_TYPE_OBJECT, + mate_window_manager_type = + g_type_register_static (G_TYPE_OBJECT, "MateWindowManager", - &mate_window_manager_info, 0); + &mate_window_manager_info, 0); } return mate_window_manager_type; |