From: Mikael Magnusson Date: Tue, 10 Jun 2008 15:52:04 +0000 (+0200) Subject: No \n on ob_debug in this branch. X-Git-Tag: mikabox-3.4.7.2~35 X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=e9849149694af110aa850b223d8c274e3ef54be0;p=mikachu%2Fopenbox.git No \n on ob_debug in this branch. --- diff --git a/openbox/imageload.c b/openbox/imageload.c index 1ac4e653..6e7fd50e 100644 --- a/openbox/imageload.c +++ b/openbox/imageload.c @@ -59,12 +59,12 @@ static void RrImageDestroyNotify(RrImage *image) { gchar *file_name = GetFileName(image); g_assert(file_name != NULL); - ob_debug("Image \"%s\" no longer needed\n", file_name); + ob_debug("Image \"%s\" no longer needed", file_name); g_hash_table_remove(image->cache->file_name_table, file_name); g_free(file_name); if (g_hash_table_size(image->cache->file_name_table) == 0) { - ob_debug("No RrImage in file_name_table, destroying\n"); + ob_debug("No RrImage in file_name_table, destroying"); DestroyFileNameTable(image->cache); } } @@ -94,7 +94,7 @@ RrImage* RrImageFetchFromFile(RrImageCache *cache, const gchar *name) /* Find out if that image has already been loaded to this cache. */ rr_image = g_hash_table_lookup(cache->file_name_table, name); if (rr_image && rr_image->cache == cache) { - ob_debug("\"%s\" already loaded in this image cache.\n", name); + ob_debug("\"%s\" already loaded in this image cache.", name); RrImageRef(rr_image); return rr_image; } @@ -111,14 +111,14 @@ RrImage* RrImageFetchFromFile(RrImageCache *cache, const gchar *name) ro_data = imlib_image_get_data_for_reading_only(); w = imlib_image_get_width(); h = imlib_image_get_height(); - ob_debug("Loaded \"%s\", dimensions %dx%d\n", name, w, h); + ob_debug("Loaded \"%s\", dimensions %dx%d", name, w, h); /* There must not be any duplicated pictures in RrImageCache. */ found_rr_image = RrImageCacheFind(cache, ro_data, w, h); if (found_rr_image) { rr_image = found_rr_image; RrImageRef(rr_image); - ob_debug("Image \"%s\" is duplicate\n", name); + ob_debug("Image \"%s\" is duplicate", name); } else { /* Create RrImage from the image and add it to file name table. */ diff --git a/openbox/openbox.c b/openbox/openbox.c index e917cf6c..87241086 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -608,7 +608,7 @@ static void parse_args(gint *argc, gchar **argv) what we want */ config_file = argv[i+1]; ++i; /* skip the argument */ - ob_debug("--config-file %s\n", config_file); + ob_debug("--config-file %s", config_file); } } else if (!strcmp(argv[i], "--sm-save-file")) { diff --git a/openbox/session.c b/openbox/session.c index e4ecb6c7..db62589a 100644 --- a/openbox/session.c +++ b/openbox/session.c @@ -413,7 +413,7 @@ static void sm_save_yourself(SmcConn conn, SmPointer data, gint save_type, (save_type == SmSaveLocal ? "SmSaveLocal" : (save_type == SmSaveGlobal ? "SmSaveGlobal" : (save_type == SmSaveBoth ? "SmSaveBoth" : "INVALID!!"))); - ob_debug_type(OB_DEBUG_SM, "Session save requested, type %s\n", sname); + ob_debug_type(OB_DEBUG_SM, "Session save requested, type %s", sname); } #endif diff --git a/openbox/window.c b/openbox/window.c index b90dc509..19b362ed 100644 --- a/openbox/window.c +++ b/openbox/window.c @@ -162,7 +162,7 @@ void window_manage(Window win) XCheckTypedWindowEvent(obt_display, win, UnmapNotify, &e)) { XPutBackEvent(obt_display, &e); - ob_debug("Trying to manage unmapped window. Aborting that.\n"); + ob_debug("Trying to manage unmapped window. Aborting that."); no_manage = TRUE; } @@ -187,7 +187,7 @@ void window_manage(Window win) if (!no_manage) { if (attrib.override_redirect) { - ob_debug("not managing override redirect window 0x%x\n", win); + ob_debug("not managing override redirect window 0x%x", win); grab_server(FALSE); } else if (is_dockapp) { @@ -200,7 +200,7 @@ void window_manage(Window win) } else { grab_server(FALSE); - ob_debug("FAILED to manage window 0x%x\n", win); + ob_debug("FAILED to manage window 0x%x", win); } }