Mabox/tint2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup whitespace

Browse Source
This commit is contained in:
o9000
2016-03-24 20:45:17 +01:00
parent d398795202
commit 7b6ce97940
24 changed files with 294 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/launcher/apps-common.c
View File

@@ -29,7 +29,7 @@
static gint compare_strings(gconstpointer a, gconstpointer b)
{
return strnatcasecmp((const char*)a, (const char*)b);
return strnatcasecmp((const char *)a, (const char *)b);
}
int parse_dektop_line(char *line, char **key, char **value)

24
src/launcher/icon-theme-common.c
View File

@@ -346,9 +346,9 @@ void test_launcher_read_theme_file()
dir->max_size,
dir->threshold,
dir->type == ICON_DIR_TYPE_FIXED ? "Fixed" : dir->type == ICON_DIR_TYPE_SCALABLE
? "Scalable"
: dir->type == ICON_DIR_TYPE_THRESHOLD ? "Threshold"
: "?????");
? "Scalable"
: dir->type == ICON_DIR_TYPE_THRESHOLD ? "Threshold"
: "?????");
item = g_slist_next(item);
}
fprintf(stdout, "\033[0m");
@@ -585,9 +585,9 @@ char *get_icon_path_helper(GSList *themes, const char *icon_name, int size)
for (theme = themes; theme; theme = g_slist_next(theme)) {
((IconTheme *)theme->data)->list_directories =
g_slist_sort_with_data(((IconTheme *)theme->data)->list_directories,
compare_theme_directories,
GINT_TO_POINTER(size));
g_slist_sort_with_data(((IconTheme *)theme->data)->list_directories,
compare_theme_directories,
GINT_TO_POINTER(size));
GSList *dir;
for (dir = ((IconTheme *)theme->data)->list_directories; dir; dir = g_slist_next(dir)) {
// Closest match
@@ -607,7 +607,7 @@ char *get_icon_path_helper(GSList *themes, const char *icon_name, int size)
char *dir_name = ((IconThemeDir *)dir->data)->name;
char *extension = (char *)ext->data;
if (strlen(base_name) + strlen(theme_name) + strlen(dir_name) + strlen(icon_name) +
strlen(extension) + 100 >
strlen(extension) + 100 >
file_name_size) {
file_name_size = strlen(base_name) + strlen(theme_name) + strlen(dir_name) + strlen(icon_name) +
strlen(extension) + 100;
@@ -714,7 +714,8 @@ char *get_icon_path_from_cache(IconThemeWrapper *wrapper, const char *icon_name,
if (!g_file_test(value, G_FILE_TEST_EXISTS))
return NULL;
// fprintf(stderr, "Icon path found in cache: theme = %s, icon = %s, size = %d, path = %s\n", wrapper->icon_theme_name, icon_name, size, value);
// fprintf(stderr, "Icon path found in cache: theme = %s, icon = %s, size = %d, path = %s\n",
// wrapper->icon_theme_name, icon_name, size, value);
return strdup(value);
}
@@ -724,7 +725,12 @@ void add_icon_path_to_cache(IconThemeWrapper *wrapper, const char *icon_name, in
if (!wrapper || !icon_name || strlen(icon_name) == 0 || !path || strlen(path) == 0)
return;
fprintf(stderr, "Adding icon path to cache: theme = %s, icon = %s, size = %d, path = %s\n", wrapper->icon_theme_name, icon_name, size, path);
fprintf(stderr,
"Adding icon path to cache: theme = %s, icon = %s, size = %d, path = %s\n",
wrapper->icon_theme_name,
icon_name,
size,
path);
load_icon_cache(wrapper);

10
src/launcher/launcher.c
View File

@@ -176,7 +176,7 @@ gboolean resize_launcher(void *obj)
// Get the path for an icon file with the new size
char *new_icon_path =
get_icon_path(launcher->icon_theme_wrapper, launcherIcon->icon_name, launcherIcon->icon_size);
get_icon_path(launcher->icon_theme_wrapper, launcherIcon->icon_name, launcherIcon->icon_size);
if (!new_icon_path) {
// Draw a blank icon
free_icon(launcherIcon->image);
@@ -339,8 +339,12 @@ Imlib_Image scale_icon(Imlib_Image original, int icon_size)
Imlib_Image icon_scaled;
if (original) {
imlib_context_set_image(original);
icon_scaled =
imlib_create_cropped_scaled_image(0, 0, imlib_image_get_width(), imlib_image_get_height(), icon_size, icon_size);
icon_scaled = imlib_create_cropped_scaled_image(0,
0,
imlib_image_get_width(),
imlib_image_get_height(),
icon_size,
icon_size);
imlib_context_set_image(icon_scaled);
imlib_image_set_has_alpha(1);

22
src/launcher/xsettings-client.c
View File

@@ -350,17 +350,17 @@ static void read_settings(XSettingsClient *client)
old_handler = XSetErrorHandler(ignore_errors);
int result = XGetWindowProperty(client->display,
client->manager_window,
server.atom._XSETTINGS_SETTINGS,
0,
LONG_MAX,
False,
server.atom._XSETTINGS_SETTINGS,
&type,
&format,
&n_items,
&bytes_after,
&data);
client->manager_window,
server.atom._XSETTINGS_SETTINGS,
0,
LONG_MAX,
False,
server.atom._XSETTINGS_SETTINGS,
&type,
&format,
&n_items,
&bytes_after,
&data);
XSetErrorHandler(old_handler);
if (result == Success && type == server.atom._XSETTINGS_SETTINGS) {