changeset 15349:804e69c8ce23

[gaim-migrate @ 18141] Missing semicolon. Use HIG constants, and use the new gaim_gtk_set_urgent in the notify dialog. committer: Tailor Script <tailor@pidgin.im>
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Tue, 16 Jan 2007 22:51:40 +0000
parents 03edbb70210f
children 635cc5247696
files gtk/gtkutils.c gtk/plugins/notify.c
diffstat 2 files changed, 4 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/gtk/gtkutils.c	Tue Jan 16 22:20:26 2007 +0000
+++ b/gtk/gtkutils.c	Tue Jan 16 22:51:40 2007 +0000
@@ -2879,7 +2879,7 @@
 void gaim_gtk_set_urgent(GtkWindow *window, gboolean urgent)
 {
 #if GTK_CHECK_VERSION(2,8,0)
-	gtk_window_set_urgency_hint(window, urgent)
+	gtk_window_set_urgency_hint(window, urgent);
 #elif defined _WIN32
 	gtkwgaim_window_flash(window, urgent);
 #else
@@ -2954,7 +2954,7 @@
 	gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
 
 	vbox = gtk_vbox_new(FALSE,0);
-        gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
+        gtk_container_set_border_width(GTK_CONTAINER(vbox), GAIM_HIG_BOX_SPACE);
 
 	g_object_set_data(G_OBJECT(vbox), "gc" ,gc);
 	minidialogs = g_slist_prepend(minidialogs, vbox);
@@ -2988,7 +2988,7 @@
         gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
         gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
 
-	hbox2 = gtk_hbox_new(FALSE, 6);
+	hbox2 = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE);
 	gtk_box_pack_start(GTK_BOX(vbox), hbox2, FALSE, FALSE, 0);
 
 	va_start(args, user_data);
--- a/gtk/plugins/notify.c	Tue Jan 16 22:20:26 2007 +0000
+++ b/gtk/plugins/notify.c	Tue Jan 16 22:51:40 2007 +0000
@@ -545,24 +545,7 @@
 handle_urgent(GaimGtkWindow *win, gboolean set)
 {
 #ifndef _WIN32
-	XWMHints *hints;
-
-	g_return_if_fail(win != NULL);
-	g_return_if_fail(win->window != NULL);
-	g_return_if_fail(win->window->window != NULL);
-
-	hints = XGetWMHints(GDK_WINDOW_XDISPLAY(win->window->window),
-	                    GDK_WINDOW_XWINDOW(win->window->window));
-	if(!hints)
-		hints = XAllocWMHints();
-
-	if (set)
-		hints->flags |= XUrgencyHint;
-	else
-		hints->flags &= ~XUrgencyHint;
-	XSetWMHints(GDK_WINDOW_XDISPLAY(win->window->window),
-	            GDK_WINDOW_XWINDOW(win->window->window), hints);
-	XFree(hints);
+	gaim_gtk_set_urgent(GTK_WINDOW(win->window), set);
 #endif
 }