Merge lp:~unity-team/clutk/clutk.remove-exit-code into lp:clutk

Proposed by Jay Taoko
Status: Merged
Approved by: Gord Allott
Approved revision: 275
Merged at revision: 274
Proposed branch: lp:~unity-team/clutk/clutk.remove-exit-code
Merge into: lp:clutk
Diff against target: 24 lines (+1/-2)
2 files modified
clutk/ctk-render-target.c (+1/-1)
clutk/ctk-utils.c (+0/-1)
To merge this branch: bzr merge lp:~unity-team/clutk/clutk.remove-exit-code
Reviewer Review Type Date Requested Status
Mirco Müller (community) Approve
Review via email: mp+36043@code.launchpad.net

Description of the change

* Removed exit code for gl errors.
* Remove g_critical call when render target is not complete. Replaced with g_warning.

[modified]
  clutk/ctk-utils.c
  clutk/ctk-render-target.c

To post a comment you must log in.
Revision history for this message
Mirco Müller (macslow) wrote :

Approved.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'clutk/ctk-render-target.c'
--- clutk/ctk-render-target.c 2010-07-27 03:20:21 +0000
+++ clutk/ctk-render-target.c 2010-09-20 18:14:46 +0000
@@ -363,7 +363,7 @@
363 CHECKGL_MSG ("glCheckFramebufferStatusEXT");363 CHECKGL_MSG ("glCheckFramebufferStatusEXT");
364 if (status != GL_FRAMEBUFFER_COMPLETE_EXT)364 if (status != GL_FRAMEBUFFER_COMPLETE_EXT)
365 {365 {
366 g_critical ("Incomplete render target: %d", status);366 g_warning ("Incomplete render target: %d", status);
367 }367 }
368 368
369 if ((self->width == 0) || (self->height == 0))369 if ((self->width == 0) || (self->height == 0))
370370
=== modified file 'clutk/ctk-utils.c'
--- clutk/ctk-utils.c 2010-02-23 11:11:51 +0000
+++ clutk/ctk-utils.c 2010-09-20 18:14:46 +0000
@@ -107,7 +107,6 @@
107 file,107 file,
108 line);108 line);
109 ret_code = 1;109 ret_code = 1;
110 exit (-1);
111 }110 }
112 111
113 return ret_code;112 return ret_code;

Subscribers

People subscribed via source and target branches