summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJabier Arraiza <jabier.arraiza@marker.es>2018-07-27 22:33:34 +0000
committerJabier Arraiza <jabier.arraiza@marker.es>2018-07-27 22:33:34 +0000
commit10a3af8a1c2b965ee8303545848550222b3575b9 (patch)
tree52596709bce674d83085762ef8235f7b67cbb36e /src
parentRefactor fo theme switcher (diff)
downloadinkscape-10a3af8a1c2b965ee8303545848550222b3575b9.tar.gz
inkscape-10a3af8a1c2b965ee8303545848550222b3575b9.zip
fixing coding style
Diffstat (limited to 'src')
-rw-r--r--src/ui/dialog/inkscape-preferences.cpp5
-rw-r--r--src/ui/widget/color-notebook.cpp3
2 files changed, 3 insertions, 5 deletions
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 2be489c23..4cf31b097 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -614,9 +614,8 @@ static void _inkscape_fill_icons(const gchar *path, GHashTable *t)
gchar *filename = g_build_filename(path, dir_entry, "index.theme", NULL);
gchar *scalable = g_build_filename(path, dir_entry, "scalable", NULL);
gchar *symbolic = g_build_filename(path, dir_entry, "symbolic", NULL);
- if (g_file_test(filename, G_FILE_TEST_IS_REGULAR) &&
- (g_file_test(scalable, G_FILE_TEST_IS_DIR) ||
- g_file_test(symbolic, G_FILE_TEST_IS_DIR)) &&
+ if (g_file_test(filename, G_FILE_TEST_IS_REGULAR) &&
+ (g_file_test(scalable, G_FILE_TEST_IS_DIR) || g_file_test(symbolic, G_FILE_TEST_IS_DIR)) &&
g_strcmp0(dir_entry, "default") != 0 && !g_hash_table_contains(t, dir_entry)) {
g_hash_table_add(t, g_strdup(dir_entry));
}
diff --git a/src/ui/widget/color-notebook.cpp b/src/ui/widget/color-notebook.cpp
index 1b3c8ff2e..788ede294 100644
--- a/src/ui/widget/color-notebook.cpp
+++ b/src/ui/widget/color-notebook.cpp
@@ -160,8 +160,7 @@ void ColorNotebook::_initUI()
#if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
/* Create color management icons */
_box_colormanaged = gtk_event_box_new();
- GtkWidget *colormanaged =
- GTK_WIDGET(sp_get_icon_image("color-management", GTK_ICON_SIZE_SMALL_TOOLBAR)->gobj());
+ GtkWidget *colormanaged = GTK_WIDGET(sp_get_icon_image("color-management", GTK_ICON_SIZE_SMALL_TOOLBAR)->gobj());
gtk_container_add(GTK_CONTAINER(_box_colormanaged), colormanaged);
gtk_widget_set_tooltip_text(_box_colormanaged, _("Color Managed"));
gtk_widget_set_sensitive(_box_colormanaged, false);