#! /bin/sh /usr/share/dpatch/dpatch-run
## Security fixes for CVE-2007-1006, jmm
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -aur gnomemeeting-1.2.1.orig/src/endpoint.cpp gnomemeeting-1.2.1/src/endpoint.cpp
--- gnomemeeting-1.2.1.orig/src/endpoint.cpp	2005-02-14 08:25:24.000000000 +0000
+++ gnomemeeting-1.2.1/src/endpoint.cpp	2007-03-03 21:33:44.000000000 +0000
@@ -825,7 +825,7 @@
   /* Update the log and status bar */
   msg = g_strdup_printf (_("Call from %s"), (const char *) utf8_name);
   gnomemeeting_threads_enter ();
-  gm_main_window_flash_message (main_window, msg);
+  gm_main_window_flash_message (main_window, "%s", msg);
   gm_history_window_insert (history_window, msg);
   gnomemeeting_threads_leave ();
   g_free (msg);
@@ -897,7 +897,7 @@
     if (do_reject) {
       
       gnomemeeting_threads_enter ();
-      gm_main_window_flash_message (main_window, _("Call rejected"));
+      gm_main_window_flash_message (main_window, "%s", _("Call rejected"));
       gnomemeeting_threads_leave ();
 
       connection.ClearCall (H323Connection::EndedByLocalBusy); 
@@ -906,7 +906,7 @@
     else if (do_forward) {
 
       gnomemeeting_threads_enter ();
-      gm_main_window_flash_message (main_window, _("Call forwarded"));
+      gm_main_window_flash_message (main_window, "%s", _("Call forwarded"));
       gnomemeeting_threads_leave ();
 
       if (use_gateway && !gateway.IsEmpty ())
@@ -917,7 +917,7 @@
     else if (do_answer) {
 
       gnomemeeting_threads_enter ();
-      gm_main_window_flash_message (main_window,
+      gm_main_window_flash_message (main_window, "%s",
 				    _("Call automatically answered"));
       gnomemeeting_threads_leave ();
 
@@ -1000,7 +1000,7 @@
     gnomemeeting_threads_enter ();
     msg = g_strdup_printf (_("Forwarding call to %s"),
 			   (const char*) forward_party);
-    gm_main_window_flash_message (main_window, msg);
+    gm_main_window_flash_message (main_window, "%s", msg);
     gm_history_window_insert (history_window, msg);
     gnomemeeting_threads_leave ();
     g_free (msg);
@@ -1101,7 +1101,7 @@
   if (connection.HadAnsweredCall ())
     gm_main_window_set_call_url (main_window, GMURL ().GetDefaultURL ());
 
-  gm_main_window_flash_message (main_window, _("Connected"));
+  gm_main_window_flash_message (main_window, "%s", _("Connected"));
   gm_history_window_insert (history_window,
 			    _("Connected with %s using %s"), 
 			    utf8_name, utf8_app);
@@ -1390,7 +1390,7 @@
 
   gm_history_window_insert (history_window, msg_reason);
   gnomemeeting_text_chat_call_stop_notification (chat_window);
-  gm_main_window_flash_message (main_window, msg_reason);
+  gm_main_window_flash_message (main_window, "%s", msg_reason);
   gnomemeeting_threads_leave ();
   if (dispatcher)
     g_signal_emit_by_name (dispatcher, "call-end",
@@ -2124,7 +2124,7 @@
 
 
   gdk_threads_enter ();
-  gm_main_window_flash_message (main_window, msg);
+  gm_main_window_flash_message (main_window, "%s", msg);
 
   if (gm_conf_get_int (USER_INTERFACE_KEY "main_window/control_panel_section") 
       == 0)
@@ -2257,7 +2257,7 @@
 			       _("Forwarding Call to %s (No Answer)"), 
 			       (const char *) forward_host);
 
-      gm_main_window_flash_message (main_window, _("Call forwarded"));
+      gm_main_window_flash_message (main_window, "%s", _("Call forwarded"));
       gdk_threads_leave ();
 
       connection->Unlock ();
diff -aur gnomemeeting-1.2.1.orig/src/gatekeeper.cpp gnomemeeting-1.2.1/src/gatekeeper.cpp
--- gnomemeeting-1.2.1.orig/src/gatekeeper.cpp	2004-10-19 21:13:48.000000000 +0000
+++ gnomemeeting-1.2.1/src/gatekeeper.cpp	2007-03-03 21:33:44.000000000 +0000
@@ -133,7 +133,7 @@
 			   (const char *) gk_name);
     gnomemeeting_threads_enter ();
     gm_history_window_insert (history_window, msg);
-    gm_main_window_flash_message (main_window, msg);
+    gm_main_window_flash_message (main_window, "%s", msg);
     g_free (msg);
     gnomemeeting_threads_leave ();
   }
@@ -230,7 +230,7 @@
     
     gnomemeeting_threads_enter ();
     gm_history_window_insert (history_window, msg);
-    gm_main_window_flash_message (main_window, msg);
+    gm_main_window_flash_message (main_window, "%s", msg);
     gnomemeeting_threads_leave ();
       
     g_free (msg);
diff -aur gnomemeeting-1.2.1.orig/src/lid.cpp gnomemeeting-1.2.1/src/lid.cpp
--- gnomemeeting-1.2.1.orig/src/lid.cpp	2004-10-19 19:36:29.000000000 +0000
+++ gnomemeeting-1.2.1/src/lid.cpp	2007-03-03 21:33:44.000000000 +0000
@@ -251,7 +251,7 @@
 
       gnomemeeting_threads_enter ();
       gm_history_window_insert (history_window, _("Phone is off hook"));
-      gm_main_window_flash_message (main_window, _("Phone is off hook"));
+      gm_main_window_flash_message (main_window, "%s", _("Phone is off hook"));
       gnomemeeting_threads_leave ();
 
 
@@ -290,7 +290,7 @@
 
       gnomemeeting_threads_enter ();
       gm_history_window_insert (history_window, _("Phone is on hook"));
-      gm_main_window_flash_message (main_window, _("Phone is on hook"));
+      gm_main_window_flash_message (main_window, "%s", _("Phone is on hook"));
       gm_main_window_set_call_url (main_window, GMURL ().GetDefaultURL ());
       gnomemeeting_threads_leave ();
 
diff -aur gnomemeeting-1.2.1.orig/src/main_window.cpp gnomemeeting-1.2.1/src/main_window.cpp
--- gnomemeeting-1.2.1.orig/src/main_window.cpp	2005-01-28 11:18:16.000000000 +0000
+++ gnomemeeting-1.2.1/src/main_window.cpp	2007-03-03 21:33:44.000000000 +0000
@@ -2081,7 +2081,7 @@
       gm_main_window_set_call_url (GTK_WIDGET (data), url);
     }
     else
-      gm_main_window_flash_message (GTK_WIDGET (data),
+      gm_main_window_flash_message (GTK_WIDGET (data), "%s",
 				    _("Sent DTMF %s"), button_text [0]);
   }
 }
diff -aur gnomemeeting-1.2.1.orig/src/urlhandler.cpp gnomemeeting-1.2.1/src/urlhandler.cpp
--- gnomemeeting-1.2.1.orig/src/urlhandler.cpp	2004-11-28 13:46:01.000000000 +0000
+++ gnomemeeting-1.2.1/src/urlhandler.cpp	2007-03-03 21:33:44.000000000 +0000
@@ -463,7 +463,7 @@
 
       if (call_address.Find ("+type=directory") != P_MAX_INDEX) {
 
-	gm_main_window_flash_message (main_window, _("User not found"));
+	gm_main_window_flash_message (main_window, "%s", _("User not found"));
 	gm_calls_history_add_call (PLACED_CALL,
 				   NULL,
 				   call_address,