brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove deprecated gtk stuff.

Browse Source 
2006-11-05  Priit Laes  <amd@store20.com>

        * src/main.c, src/ui.c: remove deprecated gtk stuff.

2006-11-05  Bruno Boaventura  <brunoboaventura@gmail.com>

        * src/theme.c, src/testgradient.c: remove deprecated gtk stuff.
This commit is contained in:
Priit Laes 2006-11-05 23:03:36 +00:00 committed by Thomas James Alexander Thurman
parent 8722c60a28
commit 81256ebe48
5 changed files with 40 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2006-11-05 Priit Laes <amd@store20.com>
* src/main.c, src/ui.c: remove deprecated gtk stuff.
2006-11-05 Bruno Boaventura <brunoboaventura@gmail.com>
* src/theme.c, src/testgradient.c: remove deprecated gtk stuff.
2006-11-05 Kjartan Maraas <kmaraas@gnome.org> 2006-11-05 Kjartan Maraas <kmaraas@gnome.org>
* src/ui.c: use g_strdup to allocate a string, not strdup. Fixes * src/ui.c: use g_strdup to allocate a string, not strdup. Fixes

8
src/main.c
View File

@ -126,7 +126,7 @@ meta_print_self_identity (void)
/* Version and current date. */ /* Version and current date. */
g_date_clear (&d, 1); g_date_clear (&d, 1);
g_date_set_time (&d, time (NULL)); g_date_set_time_t (&d, time (NULL));
g_date_strftime (buf, sizeof (buf), "%x", &d); g_date_strftime (buf, sizeof (buf), "%x", &d);
meta_verbose ("Metacity version %s running on %s\n", meta_verbose ("Metacity version %s running on %s\n",
VERSION, buf); VERSION, buf);
@ -388,7 +388,7 @@ main (int argc, char **argv)
if (!meta_display_open ()) if (!meta_display_open ())
meta_exit (META_EXIT_ERROR); meta_exit (META_EXIT_ERROR);
g_main_run (meta_main_loop); g_main_loop_run (meta_main_loop);
{ {
GSList *displays; GSList *displays;
@ -446,8 +446,8 @@ meta_quit (MetaExitCode code)
{ {
meta_exit_code = code; meta_exit_code = code;
if (g_main_is_running (meta_main_loop)) if (g_main_loop_is_running (meta_main_loop))
g_main_quit (meta_main_loop); g_main_loop_quit (meta_main_loop);
} }
void void

14
src/testgradient.c
View File

@ -131,13 +131,13 @@ render_simple (GdkDrawable *drawable,
draw_checkerboard (drawable, width, height); draw_checkerboard (drawable, width, height);
} }
gdk_pixbuf_render_to_drawable (pixbuf, gdk_draw_pixbuf (drawable,
drawable, gc,
gc, pixbuf,
0, 0, 0, 0,
0, 0, width, height, 0, 0, width, height,
GDK_RGB_DITHER_MAX, GDK_RGB_DITHER_MAX,
0, 0); 0, 0);
g_object_unref (G_OBJECT (pixbuf)); g_object_unref (G_OBJECT (pixbuf));
} }

23
src/theme.c
View File

@ -2815,18 +2815,17 @@ render_pixbuf (GdkDrawable *drawable,
draw_rect = pixbuf_rect; draw_rect = pixbuf_rect;
} }
gdk_pixbuf_render_to_drawable_alpha (pixbuf, gdk_draw_pixbuf (drawable,
drawable, NULL,
draw_rect.x - pixbuf_rect.x, pixbuf,
draw_rect.y - pixbuf_rect.y, draw_rect.x - pixbuf_rect.x,
draw_rect.x, draw_rect.y, draw_rect.y - pixbuf_rect.y,
draw_rect.width, draw_rect.x, draw_rect.y,
draw_rect.height, draw_rect.width,
GDK_PIXBUF_ALPHA_FULL, /* ignored */ draw_rect.height,
128, /* ignored */ GDK_RGB_DITHER_NORMAL,
GDK_RGB_DITHER_NORMAL, draw_rect.x - pixbuf_rect.x,
draw_rect.x - pixbuf_rect.x, draw_rect.y - pixbuf_rect.y);
draw_rect.y - pixbuf_rect.y);
} }
static GdkPixbuf* static GdkPixbuf*

20
src/ui.c
View File

@ -437,16 +437,16 @@ meta_image_window_set (MetaImageWindow *iw,
* and this way flicker is genuinely zero. * and this way flicker is genuinely zero.
*/ */
gdk_pixbuf_render_to_drawable (pixbuf, gdk_draw_pixbuf (iw->pixmap,
iw->pixmap, iw->window->style->black_gc,
iw->window->style->black_gc, pixbuf,
0, 0, 0, 0,
0, 0, 0, 0,
gdk_pixbuf_get_width (pixbuf), gdk_pixbuf_get_width (pixbuf),
gdk_pixbuf_get_height (pixbuf), gdk_pixbuf_get_height (pixbuf),
GDK_RGB_DITHER_NORMAL, GDK_RGB_DITHER_NORMAL,
0, 0); 0, 0);
gdk_window_set_back_pixmap (iw->window->window, gdk_window_set_back_pixmap (iw->window->window,
iw->pixmap, iw->pixmap,
FALSE); FALSE);