diff options
| author |   Peter Volkov <pva@gentoo.org> | 2009-12-21 20:56:16 +0000 |
|---|---|---|
| committer | Peter Volkov <pva@gentoo.org> | 2009-12-21 20:56:16 +0000 |
| commit | 73dde2836fdaa11da6ca5f85f310702417ec8302 (patch) | |
| tree | 227bf5b9d61bf4dc35b2a62d94ae2b981c3c2e4d /x11-plugins/pidgin-musictracker/files | |
| parent | Version bump. Some ebuild cleanup. (diff) | |
| download | gentoo-2-73dde2836fdaa11da6ca5f85f310702417ec8302.tar.gz gentoo-2-73dde2836fdaa11da6ca5f85f310702417ec8302.tar.bz2 gentoo-2-73dde2836fdaa11da6ca5f85f310702417ec8302.zip | |
Version bump, bug #297330, fixes crash with fortify enabled.
(Portage version: 2.1.7.15/cvs/Linux x86_64)
Diffstat (limited to 'x11-plugins/pidgin-musictracker/files')
| -rw-r--r-- | x11-plugins/pidgin-musictracker/files/pidgin-musictracker-0.4.20-fortify-abort.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/x11-plugins/pidgin-musictracker/files/pidgin-musictracker-0.4.20-fortify-abort.patch b/x11-plugins/pidgin-musictracker/files/pidgin-musictracker-0.4.20-fortify-abort.patch new file mode 100644 index 000000000000..a9b8e6a6ba00 --- /dev/null +++ b/x11-plugins/pidgin-musictracker/files/pidgin-musictracker-0.4.20-fortify-abort.patch @@ -0,0 +1,51 @@ +Index: src/preferences.c +=================================================================== +--- src/preferences.c (revision 417) ++++ src/preferences.c (revision 420) +@@ -205,11 +205,15 @@ + purple_prefs_set_bool(data, state); + } + +-#define APPEND_FORMAT_MENU(name, format) \ +- sprintf(buf, "%s - %s", name, format); \ +- widget = gtk_menu_item_new_with_label(buf); \ +- gtk_menu_shell_append(GTK_MENU_SHELL(format_menu), widget); \ +- g_signal_connect(G_OBJECT(widget), "activate", G_CALLBACK(cb_format_menu), (gpointer) format); ++static void ++append_format_menu(const char *name, const char *format) ++{ ++ char *buf = g_strdup_printf("%s - %s", name, format); ++ GtkWidget *widget = gtk_menu_item_new_with_label(buf); ++ g_free(buf); ++ gtk_menu_shell_append(GTK_MENU_SHELL(format_menu), widget); ++ g_signal_connect(G_OBJECT(widget), "activate", G_CALLBACK(cb_format_menu), (gpointer) format); ++} + + #define ADD_FORMAT_ENTRY(vbox, name, type) \ + hbox = gtk_hbox_new(FALSE, 5); \ +@@ -259,16 +263,15 @@ + + // Popup menu for format + format_menu = gtk_menu_new(); +- char buf[100]; +- APPEND_FORMAT_MENU(_("Artist"), "%p"); +- APPEND_FORMAT_MENU(_("Album"), "%a"); +- APPEND_FORMAT_MENU(_("Title"), "%t"); +- APPEND_FORMAT_MENU(_("Track Duration"), "%d"); +- APPEND_FORMAT_MENU(_("Elapsed Track Time"), "%c"); +- APPEND_FORMAT_MENU(_("Progress Bar"), "%b"); +- APPEND_FORMAT_MENU(_("Player"), "%r"); +- APPEND_FORMAT_MENU(_("Music Symbol (may not display on some networks)"), "%m"); +- APPEND_FORMAT_MENU(_("Status Message"), "%s"); ++ append_format_menu(_("Artist"), "%p"); ++ append_format_menu(_("Album"), "%a"); ++ append_format_menu(_("Title"), "%t"); ++ append_format_menu(_("Track Duration"), "%d"); ++ append_format_menu(_("Elapsed Track Time"), "%c"); ++ append_format_menu(_("Progress Bar"), "%b"); ++ append_format_menu(_("Player"), "%r"); ++ append_format_menu(_("Music Symbol (may not display on some networks)"), "%m"); ++ append_format_menu(_("Status Message"), "%s"); + gtk_widget_show_all(format_menu); + + // Format selection |