File gnome-panel-no-missing-tomboy-dialog.patch of Package gnome-panel-nld

Overview Repositories Revisions Requests Users Attributes Meta

File gnome-panel-no-missing-tomboy-dialog.patch of Package gnome-panel-nld (Revision a34c47a9372a2dc3e8d5ccc6e40299e3)

Currently displaying revision a34c47a9372a2dc3e8d5ccc6e40299e3 , Show latest

--- gnome-panel/panel-applet-frame.c
+++ gnome-panel/panel-applet-frame.c
@@ -992,40 +992,44 @@
 
 	locked_down = panel_lockdown_get_locked_down ();
 
-	problem_txt = g_strdup_printf (_("The panel encountered a problem "
-					 "while loading \"%s\"."),
-				       frame->priv->iid);
-
-	dialog = gtk_message_dialog_new (NULL, 0,
-					 locked_down ? GTK_MESSAGE_INFO : GTK_MESSAGE_QUESTION,
-					 GTK_BUTTONS_NONE,
-					 problem_txt);
-	g_free (problem_txt);
-
-	if (locked_down) {
-		gtk_dialog_add_buttons (GTK_DIALOG (dialog),
-					GTK_STOCK_OK, LOADING_FAILED_RESPONSE_DONT_DELETE,
-					NULL);
-		gtk_dialog_set_default_response (GTK_DIALOG (dialog), LOADING_FAILED_RESPONSE_DONT_DELETE);
-	} else {
-		gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-					_("Do you want to delete the applet "
-					  "from your configuration?"));
-		gtk_dialog_add_buttons (GTK_DIALOG (dialog),
-					PANEL_STOCK_DONT_DELETE, LOADING_FAILED_RESPONSE_DONT_DELETE,
-					GTK_STOCK_DELETE, LOADING_FAILED_RESPONSE_DELETE,
-					NULL);
-		gtk_dialog_set_default_response (GTK_DIALOG (dialog), LOADING_FAILED_RESPONSE_DELETE);
-	}
-
-	gtk_window_set_screen (GTK_WINDOW (dialog),
-			       gtk_window_get_screen (GTK_WINDOW (frame->priv->panel->toplevel)));
-
-	g_signal_connect (dialog, "response",
-			  G_CALLBACK (panel_applet_frame_loading_failed_response),
-			  g_strdup (id));
+	// crude hack to not display the dialog for tomboy which is in the default panel config
+	// but not installed on SLES 
+	if (strcmp (frame->priv->iid, "OAFIID:TomboyApplet")) {
+		problem_txt = g_strdup_printf (_("The panel encountered a problem "
+						 "while loading \"%s\"."),
+					       frame->priv->iid);
+
+		dialog = gtk_message_dialog_new (NULL, 0,
+						 locked_down ? GTK_MESSAGE_INFO : GTK_MESSAGE_QUESTION,
+						 GTK_BUTTONS_NONE,
+						 problem_txt);
+		g_free (problem_txt);
+
+		if (locked_down) {
+			gtk_dialog_add_buttons (GTK_DIALOG (dialog),
+						GTK_STOCK_OK, LOADING_FAILED_RESPONSE_DONT_DELETE,
+						NULL);
+			gtk_dialog_set_default_response (GTK_DIALOG (dialog), LOADING_FAILED_RESPONSE_DONT_DELETE);
+		} else {
+			gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+								  _("Do you want to delete the applet "
+								    "from your configuration?"));
+			gtk_dialog_add_buttons (GTK_DIALOG (dialog),
+						PANEL_STOCK_DONT_DELETE, LOADING_FAILED_RESPONSE_DONT_DELETE,
+						GTK_STOCK_DELETE, LOADING_FAILED_RESPONSE_DELETE,
+						NULL);
+			gtk_dialog_set_default_response (GTK_DIALOG (dialog), LOADING_FAILED_RESPONSE_DELETE);
+		}
+
+		gtk_window_set_screen (GTK_WINDOW (dialog),
+				       gtk_window_get_screen (GTK_WINDOW (frame->priv->panel->toplevel)));
+
+		g_signal_connect (dialog, "response",
+				  G_CALLBACK (panel_applet_frame_loading_failed_response),
+				  g_strdup (id));
 
-	gtk_widget_show_all (dialog);
+		gtk_widget_show_all (dialog);
+	}
 
 	g_free (frame->priv->iid);
 	g_free (frame);

Places

File gnome-panel-no-missing-tomboy-dialog.patch of Package gnome-panel-nld (Revision a34c47a9372a2dc3e8d5ccc6e40299e3)

Places