From 2699bc858d4c563a5a658d0ab8b128684bf843fa Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Mon, 23 Oct 2006 19:39:50 +0000 Subject: [PATCH 01/20] Initialize branch FC-6 for xfce-mcs-plugins --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..d5b6362 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +FC-6 From 4f5d395ffbf5368c718d76f231fb851875a0582e Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 11 Nov 2006 07:52:27 +0000 Subject: [PATCH 02/20] Update to 4.3.99.2 --- .cvsignore | 2 +- sources | 2 +- xfce-mcs-plugins.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3a4eaca..47fa5f6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xfce-mcs-plugins-4.3.99.1.tar.bz2 +xfce-mcs-plugins-4.3.99.2.tar.bz2 diff --git a/sources b/sources index 61af741..3025483 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -98b0b149110056b93587c66852fc3194 xfce-mcs-plugins-4.3.99.1.tar.bz2 +6234425227e1145319bd75ef52fa97f5 xfce-mcs-plugins-4.3.99.2.tar.bz2 diff --git a/xfce-mcs-plugins.spec b/xfce-mcs-plugins.spec index d91a80c..ff0b98a 100644 --- a/xfce-mcs-plugins.spec +++ b/xfce-mcs-plugins.spec @@ -1,10 +1,10 @@ Summary: Plugins for multi channel settings manager Name: xfce-mcs-plugins -Version: 4.3.99.1 -Release: 3%{?dist} +Version: 4.3.99.2 +Release: 1%{?dist} License: GPL URL: http://www.xfce.org/ -Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce-mcs-plugins-4.3.99.1.tar.bz2 +Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce-mcs-plugins-4.3.99.2.tar.bz2 Patch: xfce-mcs-plugins-4.2.0-rh.patch Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/*/*/apps/* %changelog +* Fri Nov 10 2006 Kevin Fenzi - 4.3.99.2-1 +- Update to 4.3.99.2 + * Thu Oct 5 2006 Kevin Fenzi - 4.3.99.1-3 - Fix defattr From 4bfec7f5acbb69fa2a87c6040fd94bd81c5d05d9 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 11 Nov 2006 19:36:29 +0000 Subject: [PATCH 03/20] Update to 4.3.99.2 --- .cvsignore | 2 +- sources | 2 +- xfce-mcs-plugins.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3a4eaca..47fa5f6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xfce-mcs-plugins-4.3.99.1.tar.bz2 +xfce-mcs-plugins-4.3.99.2.tar.bz2 diff --git a/sources b/sources index 61af741..3025483 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -98b0b149110056b93587c66852fc3194 xfce-mcs-plugins-4.3.99.1.tar.bz2 +6234425227e1145319bd75ef52fa97f5 xfce-mcs-plugins-4.3.99.2.tar.bz2 diff --git a/xfce-mcs-plugins.spec b/xfce-mcs-plugins.spec index d91a80c..ff0b98a 100644 --- a/xfce-mcs-plugins.spec +++ b/xfce-mcs-plugins.spec @@ -1,10 +1,10 @@ Summary: Plugins for multi channel settings manager Name: xfce-mcs-plugins -Version: 4.3.99.1 -Release: 3%{?dist} +Version: 4.3.99.2 +Release: 1%{?dist} License: GPL URL: http://www.xfce.org/ -Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce-mcs-plugins-4.3.99.1.tar.bz2 +Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce-mcs-plugins-4.3.99.2.tar.bz2 Patch: xfce-mcs-plugins-4.2.0-rh.patch Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/*/*/apps/* %changelog +* Fri Nov 10 2006 Kevin Fenzi - 4.3.99.2-1 +- Update to 4.3.99.2 + * Thu Oct 5 2006 Kevin Fenzi - 4.3.99.1-3 - Fix defattr From b5f81f14a0fc32f9da159978466d718c1a13a808 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 22 Jan 2007 08:50:59 +0000 Subject: [PATCH 04/20] Update to 4.4.0 --- .cvsignore | 2 +- sources | 2 +- xfce-mcs-plugins.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 47fa5f6..1c74cbe 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xfce-mcs-plugins-4.3.99.2.tar.bz2 +xfce-mcs-plugins-4.4.0.tar.bz2 diff --git a/sources b/sources index 3025483..2dde37b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6234425227e1145319bd75ef52fa97f5 xfce-mcs-plugins-4.3.99.2.tar.bz2 +95213345e3ccd224a30b2be01e9c06b9 xfce-mcs-plugins-4.4.0.tar.bz2 diff --git a/xfce-mcs-plugins.spec b/xfce-mcs-plugins.spec index ff0b98a..bcd47a8 100644 --- a/xfce-mcs-plugins.spec +++ b/xfce-mcs-plugins.spec @@ -1,10 +1,10 @@ Summary: Plugins for multi channel settings manager Name: xfce-mcs-plugins -Version: 4.3.99.2 +Version: 4.4.0 Release: 1%{?dist} License: GPL URL: http://www.xfce.org/ -Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce-mcs-plugins-4.3.99.2.tar.bz2 +Source0: http://www.xfce.org/archive/xfce-4.4.0/src/xfce-mcs-plugins-4.4.0.tar.bz2 Patch: xfce-mcs-plugins-4.2.0-rh.patch Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/*/*/apps/* %changelog +* Sun Jan 21 2007 Kevin Fenzi - 4.4.0-1 +- Update to 4.4.0 + * Fri Nov 10 2006 Kevin Fenzi - 4.3.99.2-1 - Update to 4.3.99.2 From fd01c9fd5f947d52d1e0d9fadc52304dba3558de Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 27 Jan 2007 21:18:48 +0000 Subject: [PATCH 05/20] Update to 4.4.0 --- .cvsignore | 2 +- sources | 2 +- xfce-mcs-plugins.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 47fa5f6..1c74cbe 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xfce-mcs-plugins-4.3.99.2.tar.bz2 +xfce-mcs-plugins-4.4.0.tar.bz2 diff --git a/sources b/sources index 3025483..2dde37b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6234425227e1145319bd75ef52fa97f5 xfce-mcs-plugins-4.3.99.2.tar.bz2 +95213345e3ccd224a30b2be01e9c06b9 xfce-mcs-plugins-4.4.0.tar.bz2 diff --git a/xfce-mcs-plugins.spec b/xfce-mcs-plugins.spec index ff0b98a..bcd47a8 100644 --- a/xfce-mcs-plugins.spec +++ b/xfce-mcs-plugins.spec @@ -1,10 +1,10 @@ Summary: Plugins for multi channel settings manager Name: xfce-mcs-plugins -Version: 4.3.99.2 +Version: 4.4.0 Release: 1%{?dist} License: GPL URL: http://www.xfce.org/ -Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce-mcs-plugins-4.3.99.2.tar.bz2 +Source0: http://www.xfce.org/archive/xfce-4.4.0/src/xfce-mcs-plugins-4.4.0.tar.bz2 Patch: xfce-mcs-plugins-4.2.0-rh.patch Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/*/*/apps/* %changelog +* Sun Jan 21 2007 Kevin Fenzi - 4.4.0-1 +- Update to 4.4.0 + * Fri Nov 10 2006 Kevin Fenzi - 4.3.99.2-1 - Update to 4.3.99.2 From 83e9661301880bd56ea8be93b736874c23ea7ef2 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 19 Apr 2007 02:34:41 +0000 Subject: [PATCH 06/20] Update to 4.4.1 Own some unowned directories --- .cvsignore | 2 +- sources | 2 +- xfce-mcs-plugins.spec | 12 +++++++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1c74cbe..59947cf 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xfce-mcs-plugins-4.4.0.tar.bz2 +xfce-mcs-plugins-4.4.1.tar.bz2 diff --git a/sources b/sources index 2dde37b..986c5b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -95213345e3ccd224a30b2be01e9c06b9 xfce-mcs-plugins-4.4.0.tar.bz2 +99f05b5ce95f24c205731565210aa8a9 xfce-mcs-plugins-4.4.1.tar.bz2 diff --git a/xfce-mcs-plugins.spec b/xfce-mcs-plugins.spec index bcd47a8..ce9ab40 100644 --- a/xfce-mcs-plugins.spec +++ b/xfce-mcs-plugins.spec @@ -1,10 +1,10 @@ Summary: Plugins for multi channel settings manager Name: xfce-mcs-plugins -Version: 4.4.0 +Version: 4.4.1 Release: 1%{?dist} License: GPL URL: http://www.xfce.org/ -Source0: http://www.xfce.org/archive/xfce-4.4.0/src/xfce-mcs-plugins-4.4.0.tar.bz2 +Source0: http://www.xfce.org/archive/xfce-4.4.1/src/xfce-mcs-plugins-4.4.1.tar.bz2 Patch: xfce-mcs-plugins-4.2.0-rh.patch Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -49,11 +49,17 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/xfce4/doc/fr %{_datadir}/xfce4/doc/it %{_libdir}/xfce4/mcs-plugins/* -%{_datadir}/xfce-mcs-plugins/shortcuts/default.xml +%{_datadir}/xfce-mcs-plugins/ %{_datadir}/applications/* %{_datadir}/icons/*/*/apps/* %changelog +* Wed Apr 11 2007 Kevin Fenzi - 4.4.1-1 +- Update to 4.4.1 + +* Tue Apr 3 2007 Kevin Fenzi - 4.4.0-2 +- Own some unowned directories + * Sun Jan 21 2007 Kevin Fenzi - 4.4.0-1 - Update to 4.4.0 From 320ae326992e7255e0b877dafbb49ad99b61ae5a Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 23 Apr 2007 02:45:53 +0000 Subject: [PATCH 07/20] Update to 4.4.1 Own some unowned directories --- .cvsignore | 2 +- sources | 2 +- xfce-mcs-plugins.spec | 12 +++++++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1c74cbe..59947cf 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xfce-mcs-plugins-4.4.0.tar.bz2 +xfce-mcs-plugins-4.4.1.tar.bz2 diff --git a/sources b/sources index 2dde37b..986c5b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -95213345e3ccd224a30b2be01e9c06b9 xfce-mcs-plugins-4.4.0.tar.bz2 +99f05b5ce95f24c205731565210aa8a9 xfce-mcs-plugins-4.4.1.tar.bz2 diff --git a/xfce-mcs-plugins.spec b/xfce-mcs-plugins.spec index bcd47a8..ce9ab40 100644 --- a/xfce-mcs-plugins.spec +++ b/xfce-mcs-plugins.spec @@ -1,10 +1,10 @@ Summary: Plugins for multi channel settings manager Name: xfce-mcs-plugins -Version: 4.4.0 +Version: 4.4.1 Release: 1%{?dist} License: GPL URL: http://www.xfce.org/ -Source0: http://www.xfce.org/archive/xfce-4.4.0/src/xfce-mcs-plugins-4.4.0.tar.bz2 +Source0: http://www.xfce.org/archive/xfce-4.4.1/src/xfce-mcs-plugins-4.4.1.tar.bz2 Patch: xfce-mcs-plugins-4.2.0-rh.patch Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -49,11 +49,17 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/xfce4/doc/fr %{_datadir}/xfce4/doc/it %{_libdir}/xfce4/mcs-plugins/* -%{_datadir}/xfce-mcs-plugins/shortcuts/default.xml +%{_datadir}/xfce-mcs-plugins/ %{_datadir}/applications/* %{_datadir}/icons/*/*/apps/* %changelog +* Wed Apr 11 2007 Kevin Fenzi - 4.4.1-1 +- Update to 4.4.1 + +* Tue Apr 3 2007 Kevin Fenzi - 4.4.0-2 +- Own some unowned directories + * Sun Jan 21 2007 Kevin Fenzi - 4.4.0-1 - Update to 4.4.0 From cea235db90d4e198d1cbb0abf455733a80adc9a7 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 31 Jul 2007 05:14:00 +0000 Subject: [PATCH 08/20] Add dpi interface option. (fixes #244286) --- xfce-mcs-plugins-4.4.1-dpi.patch | 350 +++++++++++++++++++++++++++++++ xfce-mcs-plugins.spec | 7 +- 2 files changed, 356 insertions(+), 1 deletion(-) create mode 100644 xfce-mcs-plugins-4.4.1-dpi.patch diff --git a/xfce-mcs-plugins-4.4.1-dpi.patch b/xfce-mcs-plugins-4.4.1-dpi.patch new file mode 100644 index 0000000..2ba4e61 --- /dev/null +++ b/xfce-mcs-plugins-4.4.1-dpi.patch @@ -0,0 +1,350 @@ +diff -uNr xfce-mcs-plugins-4.4.1.orig/plugins/ui_plugin/ui_plugin.c xfce-mcs-plugins-4.4.1/plugins/ui_plugin/ui_plugin.c +--- xfce-mcs-plugins-4.4.1.orig/plugins/ui_plugin/ui_plugin.c 2007-02-17 00:38:20.000000000 -0800 ++++ xfce-mcs-plugins-4.4.1/plugins/ui_plugin/ui_plugin.c 2007-06-14 05:51:52.000000000 -0700 +@@ -16,6 +16,7 @@ + gnome theme-switcher capplet - (c) Jonathan Blandford + xfce4 mcs plugin - (c) 2002 Olivier Fourdan + (c) 2004-2006 Benedikt Meurer ++ (c) 2005-2007 Brian Tarircone + sub-pixel icons stolen from KDE :) + + */ +@@ -29,6 +30,10 @@ + #include + #endif + ++#ifdef HAVE_STDLIB_H ++#include ++#endif ++ + #include + + #include +@@ -112,6 +117,17 @@ + "aaaaaaaaaaaa" + }; + ++static const gchar *xft_dpi_default_entries[4] = ++{ ++ N_("System Default"), "75", "96", "100", ++}; ++static const gint xft_dpi_default_values[4] = ++{ ++ /* fortunately, 'Xft.dpi: 0' appears to be interpreted as ++ * 'system default' */ ++ 0, 75, 96, 100, ++}; ++ + #define RCDIR "mcs_settings" + #define OLDRCDIR "settings" + #define RCFILE "gtk.xml" +@@ -143,6 +159,7 @@ + static gint current_xft_hinting = DEFAULT_XFT_HINTING; + static gchar *current_xft_hintstyle = NULL; + static gchar *current_xft_rgba = NULL; ++static gint current_dpi = 0; + + static GtkTooltips *tooltips = NULL; + +@@ -167,7 +184,9 @@ + GtkWidget *label1; + GtkWidget *vbox3; + GtkWidget *frame2; ++ GtkWidget *font_vbox; + GtkWidget *button3; ++ GtkWidget *dpi_combo; + GtkWidget *frame3; + GtkWidget *optionmenu1; + GtkWidget *frame5; +@@ -499,6 +518,188 @@ + } + } + ++static void ++handle_dpi_change(Itf *itf) ++{ ++ gint r; ++ ++ mcs_manager_set_int(itf->mcs_plugin->manager, "Xfce/XftDPI", CHANNEL, current_dpi); ++ mcs_manager_notify(itf->mcs_plugin->manager, CHANNEL); ++ write_options(itf->mcs_plugin); ++ apply_xft_options(itf); ++ ++ r = xfce_message_dialog(GTK_WINDOW(itf->theme_dialog), _("DPI Changed"), ++ GTK_STOCK_DIALOG_INFO, ++ _("DPI was changed successfully"), ++ _("However, you may need to restart your session for the settings to take effect."), ++ XFCE_CUSTOM_STOCK_BUTTON, ++ _("Log Out Later"), ++ GTK_STOCK_CLOSE, GTK_RESPONSE_CANCEL, ++ XFCE_CUSTOM_STOCK_BUTTON, _("Log Out Now"), ++ GTK_STOCK_QUIT, GTK_RESPONSE_ACCEPT, NULL); ++ if(GTK_RESPONSE_ACCEPT == r) { ++ GError *error = NULL; ++ ++ if(!xfce_exec("xfce4-session-logout", FALSE, FALSE, &error)) { ++ xfce_message_dialog(GTK_WINDOW(itf->theme_dialog), ++ _("Exec Error"), GTK_STOCK_DIALOG_ERROR, ++ _("Failed to run \"xfce4-session-logout\""), ++ error->message, ++ GTK_STOCK_CLOSE, GTK_RESPONSE_ACCEPT, NULL); ++ g_error_free(error); ++ } ++ } ++} ++ ++static gboolean ++handle_user_entered_dpi(Itf *itf) ++{ ++ GtkWidget *dlg, *topvbox, *hbox, *img, *lbl, *spin, *spacer; ++ gint resp; ++ ++ dlg = xfce_titled_dialog_new_with_buttons(_("Custom DPI"), ++ GTK_WINDOW(itf->theme_dialog), ++ GTK_DIALOG_NO_SEPARATOR ++ | GTK_DIALOG_DESTROY_WITH_PARENT, ++ GTK_STOCK_CANCEL, ++ GTK_RESPONSE_CANCEL, ++ GTK_STOCK_SAVE, ++ GTK_RESPONSE_ACCEPT, NULL); ++ gtk_dialog_set_default_response(GTK_DIALOG(dlg), GTK_RESPONSE_ACCEPT); ++ gtk_window_set_icon_name(GTK_WINDOW(dlg), "xfce4-ui"); ++ topvbox = GTK_DIALOG(dlg)->vbox; ++ ++ hbox = gtk_hbox_new(FALSE, BORDER); ++ gtk_widget_show(hbox); ++ gtk_box_pack_start(GTK_BOX(topvbox), hbox, FALSE, FALSE, 0); ++ ++ img = gtk_image_new_from_stock(GTK_STOCK_DIALOG_INFO, ++ GTK_ICON_SIZE_DIALOG); ++ gtk_widget_show(img); ++ gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); ++ ++ lbl = gtk_label_new(_("Enter your display's DPI below. Numbers that are multiples of 6 usually work best. The smaller the number, the smaller your fonts will look.")); ++ gtk_label_set_line_wrap(GTK_LABEL(lbl), TRUE); ++ gtk_misc_set_alignment(GTK_MISC(lbl), 0.0, 0.5); ++ gtk_widget_show(lbl); ++ gtk_box_pack_start(GTK_BOX(hbox), lbl, TRUE, TRUE, 0); ++ ++ spacer = gtk_alignment_new(0.5, 0.5, 1.0, 1.0); ++ gtk_widget_set_size_request(spacer, -1, 12); ++ gtk_widget_show(spacer); ++ gtk_box_pack_start(GTK_BOX(topvbox), spacer, FALSE, FALSE, 0); ++ ++ hbox = gtk_hbox_new(FALSE, BORDER); ++ gtk_widget_show(hbox); ++ gtk_box_pack_start(GTK_BOX(topvbox), hbox, FALSE, FALSE, 0); ++ ++ lbl = gtk_label_new_with_mnemonic(_("Custom _DPI:")); ++ gtk_widget_show(lbl); ++ gtk_box_pack_start(GTK_BOX(hbox), lbl, FALSE, FALSE, 0); ++ ++ spin = gtk_spin_button_new_with_range(24, 264, 1); ++ if(!current_dpi) { ++ /* FIXME: get the actual current dpi */ ++ gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin), 100); ++ } else ++ gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin), current_dpi); ++ gtk_widget_show(spin); ++ gtk_box_pack_start(GTK_BOX(hbox), spin, FALSE, FALSE, 0); ++ gtk_label_set_mnemonic_widget(GTK_LABEL(lbl), spin); ++ ++ resp = gtk_dialog_run(GTK_DIALOG(dlg)); ++ ++ if(GTK_RESPONSE_ACCEPT == resp) ++ current_dpi = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin)); ++ ++ gtk_widget_destroy(dlg); ++ ++ return (GTK_RESPONSE_ACCEPT == resp); ++} ++ ++static void ++on_dpi_combo_changed(GtkComboBox *combo, ++ gpointer user_data) ++{ ++ Itf *itf = (Itf *)user_data; ++ gint selected, old_dpi = current_dpi; ++ ++ selected = gtk_combo_box_get_active(combo); ++ ++ if(selected < G_N_ELEMENTS(xft_dpi_default_values)) ++ current_dpi = xft_dpi_default_values[selected]; ++ else { ++ gchar *text = gtk_combo_box_get_active_text(combo); ++ if(!strcmp(text, _("Other..."))) { ++ if(handle_user_entered_dpi(itf)) { ++ gint i; ++ gboolean done = FALSE; ++ ++ /* if there's an old custom dpi, remove it from the box */ ++ if(selected > G_N_ELEMENTS(xft_dpi_default_values)) ++ gtk_combo_box_remove_text(combo, selected - 1); ++ ++ /* make sure they didn't set one of our default values */ ++ for(i = 1; i < G_N_ELEMENTS(xft_dpi_default_values); ++i) { ++ if(xft_dpi_default_values[i] == current_dpi) { ++ g_signal_handlers_block_by_func(G_OBJECT(combo), ++ G_CALLBACK(on_dpi_combo_changed), ++ itf); ++ gtk_combo_box_set_active(combo, i); ++ g_signal_handlers_unblock_by_func(G_OBJECT(combo), ++ G_CALLBACK(on_dpi_combo_changed), ++ itf); ++ done = TRUE; ++ break; ++ } ++ } ++ ++ if(!done) { ++ /* if we get here, we have to create a new entry */ ++ gchar *str = g_strdup_printf("%d", current_dpi); ++ gtk_combo_box_insert_text(combo, ++ G_N_ELEMENTS(xft_dpi_default_values), ++ str); ++ ++ /* set the combo to the new entry, but block this func ++ * from getting called on the change */ ++ g_signal_handlers_block_by_func(G_OBJECT(combo), ++ G_CALLBACK(on_dpi_combo_changed), ++ itf); ++ gtk_combo_box_set_active(combo, ++ G_N_ELEMENTS(xft_dpi_default_values)); ++ g_signal_handlers_unblock_by_func(G_OBJECT(combo), ++ G_CALLBACK(on_dpi_combo_changed), ++ itf); ++ } ++ } else { ++ /* user canceled, so reset the last-selected item */ ++ gint i; ++ ++ for(i = 0; i <= G_N_ELEMENTS(xft_dpi_default_values); ++i) { ++ if(G_N_ELEMENTS(xft_dpi_default_values) == i ++ || xft_dpi_default_values[i] == current_dpi) ++ { ++ g_signal_handlers_block_by_func(G_OBJECT(combo), ++ G_CALLBACK(on_dpi_combo_changed), ++ itf); ++ gtk_combo_box_set_active(combo, i); ++ g_signal_handlers_unblock_by_func(G_OBJECT(combo), ++ G_CALLBACK(on_dpi_combo_changed), ++ itf); ++ break; ++ } ++ } ++ } ++ } else ++ current_dpi = atoi(text); /* we should be able to trust this */ ++ g_free(text); ++ } ++ ++ if(old_dpi != current_dpi) ++ handle_dpi_change(itf); ++} ++ + static gint sort_func(GtkTreeModel * model, GtkTreeIter * a, GtkTreeIter * b, gpointer user_data) + { + gchar *a_str = NULL; +@@ -672,6 +873,8 @@ + GdkPixbuf *icon; + GtkTreeIter iter; + GtkCellRenderer *cell[2]; ++ GtkWidget *hbox, *lbl; ++ gint i, selected = -1; + + dialog = g_new(Itf, 1); + +@@ -758,11 +961,50 @@ + gtk_widget_show(dialog->vbox3); + gtk_box_pack_start(GTK_BOX(dialog->hbox1), dialog->vbox3, TRUE, TRUE, 0); + ++ dialog->font_vbox = gtk_vbox_new(FALSE, BORDER); ++ gtk_widget_show(dialog->font_vbox); ++ + dialog->button3 = gtk_button_new(); + gtk_button_set_label(GTK_BUTTON(dialog->button3), current_font); + gtk_widget_show(dialog->button3); ++ gtk_box_pack_start(GTK_BOX(dialog->font_vbox), dialog->button3, FALSE, FALSE, 0); ++ ++ hbox = gtk_hbox_new(FALSE, BORDER); ++ gtk_widget_show(hbox); ++ gtk_box_pack_start(GTK_BOX(dialog->font_vbox), hbox, FALSE, FALSE, 0); ++ ++ lbl = gtk_label_new_with_mnemonic(_("Font _DPI:")); ++ gtk_widget_show(lbl); ++ gtk_box_pack_start(GTK_BOX(hbox), lbl, FALSE, FALSE, 0); ++ ++ for(i = 0; i < G_N_ELEMENTS(xft_dpi_default_values); ++i) { ++ if(xft_dpi_default_values[i] == current_dpi) { ++ selected = i; ++ break; ++ } ++ } ++ ++ dialog->dpi_combo = gtk_combo_box_new_text(); ++ for(i = 0; i < G_N_ELEMENTS(xft_dpi_default_entries); ++i) { ++ gtk_combo_box_append_text(GTK_COMBO_BOX(dialog->dpi_combo), ++ _(xft_dpi_default_entries[i])); ++ if(selected == i) ++ gtk_combo_box_set_active(GTK_COMBO_BOX(dialog->dpi_combo), selected); ++ } ++ if(-1 == selected) { ++ gchar *str = g_strdup_printf("%d", current_dpi); ++ gtk_combo_box_append_text(GTK_COMBO_BOX(dialog->dpi_combo), str); ++ gtk_combo_box_set_active(GTK_COMBO_BOX(dialog->dpi_combo), ++ G_N_ELEMENTS(xft_dpi_default_entries)); ++ g_free(str); ++ } ++ gtk_combo_box_append_text(GTK_COMBO_BOX(dialog->dpi_combo), ++ _("Other...")); ++ gtk_widget_show(dialog->dpi_combo); ++ gtk_box_pack_start(GTK_BOX(hbox), dialog->dpi_combo, TRUE, TRUE, 0); ++ gtk_label_set_mnemonic_widget(GTK_LABEL(lbl), dialog->dpi_combo); + +- dialog->frame2 = xfce_create_framebox_with_content (_("Font"), dialog->button3); ++ dialog->frame2 = xfce_create_framebox_with_content (_("Font"), dialog->font_vbox); + gtk_widget_show(dialog->frame2); + gtk_box_pack_start(GTK_BOX(dialog->vbox3), dialog->frame2, TRUE, FALSE, 0); + +@@ -919,6 +1161,7 @@ + + g_signal_connect(G_OBJECT(itf->theme_dialog), "response", G_CALLBACK(cb_dialog_response), itf->mcs_plugin); + g_signal_connect(G_OBJECT(itf->button3), "clicked", G_CALLBACK(show_font_selection), itf); ++ g_signal_connect(G_OBJECT(itf->dpi_combo), "changed", G_CALLBACK(on_dpi_combo_changed), itf); + g_signal_connect(G_OBJECT(itf->optionmenu1), "changed", G_CALLBACK(on_icons_changed), itf); + g_signal_connect(G_OBJECT(itf->accel_checkbox), "toggled", G_CALLBACK(on_change_accel_toggled), itf); + +@@ -1036,6 +1279,12 @@ + current_font = g_strdup(DEFAULT_FONT); + mcs_manager_set_string(mcs_plugin->manager, "Gtk/FontName", CHANNEL, current_font); + } ++ ++ setting = mcs_manager_setting_lookup(mcs_plugin->manager, "Xfce/XftDPI", CHANNEL); ++ if(setting) ++ current_dpi = setting->data.v_int; ++ else ++ mcs_manager_set_int(mcs_plugin->manager, "Xfce/XftDPI", CHANNEL, current_dpi); + + setting = mcs_manager_setting_lookup(mcs_plugin->manager, "Gtk/ToolbarStyle", CHANNEL); + if(setting) +@@ -1167,12 +1416,20 @@ + else + fprintf(fp, "Xft.hintstyle: hintnone\n"); + fprintf(fp, "Xft.rgba: %s\n", current_xft_rgba); ++ if(current_dpi > 0) ++ fprintf(fp, "Xft.dpi: %d\n", current_dpi); + fclose(fp); + + /* run xrdb to merge the new settings */ + cmd = g_strdup_printf("xrdb -nocpp -merge \"%s\"", path); + g_spawn_command_line_async(cmd, NULL); + g_free(cmd); ++ ++ if(!current_dpi) { ++ /* filter out Xft.dpi from xrdb */ ++ g_spawn_command_line_async("sh -c \"xrdb -query | grep -i -v '^Xft.dpi:' | xrdb\"", ++ NULL); ++ } + } + g_free(path); + } diff --git a/xfce-mcs-plugins.spec b/xfce-mcs-plugins.spec index ce9ab40..521cce6 100644 --- a/xfce-mcs-plugins.spec +++ b/xfce-mcs-plugins.spec @@ -1,11 +1,12 @@ Summary: Plugins for multi channel settings manager Name: xfce-mcs-plugins Version: 4.4.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL URL: http://www.xfce.org/ Source0: http://www.xfce.org/archive/xfce-4.4.1/src/xfce-mcs-plugins-4.4.1.tar.bz2 Patch: xfce-mcs-plugins-4.2.0-rh.patch +Patch1: xfce-mcs-plugins-4.4.1-dpi.patch Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: xfce-mcs-manager >= %{version} @@ -25,6 +26,7 @@ settings manager. %prep %setup -q %patch -p1 -b .fedora +%patch1 -p1 -b .dpi %build %configure @@ -54,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/*/*/apps/* %changelog +* Mon Jul 30 2007 Kevin Fenzi - 4.4.1-2 +- Add dpi interface option. (fixes #244286) + * Wed Apr 11 2007 Kevin Fenzi - 4.4.1-1 - Update to 4.4.1 From 7aefd13b0e0a2b4ad6ddce56873e87b3a9a6c783 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 9 Aug 2007 00:57:42 +0000 Subject: [PATCH 09/20] Add dpi interface option. (fixes #244286) --- xfce-mcs-plugins-4.4.1-dpi.patch | 350 +++++++++++++++++++++++++++++++ xfce-mcs-plugins.spec | 7 +- 2 files changed, 356 insertions(+), 1 deletion(-) create mode 100644 xfce-mcs-plugins-4.4.1-dpi.patch diff --git a/xfce-mcs-plugins-4.4.1-dpi.patch b/xfce-mcs-plugins-4.4.1-dpi.patch new file mode 100644 index 0000000..2ba4e61 --- /dev/null +++ b/xfce-mcs-plugins-4.4.1-dpi.patch @@ -0,0 +1,350 @@ +diff -uNr xfce-mcs-plugins-4.4.1.orig/plugins/ui_plugin/ui_plugin.c xfce-mcs-plugins-4.4.1/plugins/ui_plugin/ui_plugin.c +--- xfce-mcs-plugins-4.4.1.orig/plugins/ui_plugin/ui_plugin.c 2007-02-17 00:38:20.000000000 -0800 ++++ xfce-mcs-plugins-4.4.1/plugins/ui_plugin/ui_plugin.c 2007-06-14 05:51:52.000000000 -0700 +@@ -16,6 +16,7 @@ + gnome theme-switcher capplet - (c) Jonathan Blandford + xfce4 mcs plugin - (c) 2002 Olivier Fourdan + (c) 2004-2006 Benedikt Meurer ++ (c) 2005-2007 Brian Tarircone + sub-pixel icons stolen from KDE :) + + */ +@@ -29,6 +30,10 @@ + #include + #endif + ++#ifdef HAVE_STDLIB_H ++#include ++#endif ++ + #include + + #include +@@ -112,6 +117,17 @@ + "aaaaaaaaaaaa" + }; + ++static const gchar *xft_dpi_default_entries[4] = ++{ ++ N_("System Default"), "75", "96", "100", ++}; ++static const gint xft_dpi_default_values[4] = ++{ ++ /* fortunately, 'Xft.dpi: 0' appears to be interpreted as ++ * 'system default' */ ++ 0, 75, 96, 100, ++}; ++ + #define RCDIR "mcs_settings" + #define OLDRCDIR "settings" + #define RCFILE "gtk.xml" +@@ -143,6 +159,7 @@ + static gint current_xft_hinting = DEFAULT_XFT_HINTING; + static gchar *current_xft_hintstyle = NULL; + static gchar *current_xft_rgba = NULL; ++static gint current_dpi = 0; + + static GtkTooltips *tooltips = NULL; + +@@ -167,7 +184,9 @@ + GtkWidget *label1; + GtkWidget *vbox3; + GtkWidget *frame2; ++ GtkWidget *font_vbox; + GtkWidget *button3; ++ GtkWidget *dpi_combo; + GtkWidget *frame3; + GtkWidget *optionmenu1; + GtkWidget *frame5; +@@ -499,6 +518,188 @@ + } + } + ++static void ++handle_dpi_change(Itf *itf) ++{ ++ gint r; ++ ++ mcs_manager_set_int(itf->mcs_plugin->manager, "Xfce/XftDPI", CHANNEL, current_dpi); ++ mcs_manager_notify(itf->mcs_plugin->manager, CHANNEL); ++ write_options(itf->mcs_plugin); ++ apply_xft_options(itf); ++ ++ r = xfce_message_dialog(GTK_WINDOW(itf->theme_dialog), _("DPI Changed"), ++ GTK_STOCK_DIALOG_INFO, ++ _("DPI was changed successfully"), ++ _("However, you may need to restart your session for the settings to take effect."), ++ XFCE_CUSTOM_STOCK_BUTTON, ++ _("Log Out Later"), ++ GTK_STOCK_CLOSE, GTK_RESPONSE_CANCEL, ++ XFCE_CUSTOM_STOCK_BUTTON, _("Log Out Now"), ++ GTK_STOCK_QUIT, GTK_RESPONSE_ACCEPT, NULL); ++ if(GTK_RESPONSE_ACCEPT == r) { ++ GError *error = NULL; ++ ++ if(!xfce_exec("xfce4-session-logout", FALSE, FALSE, &error)) { ++ xfce_message_dialog(GTK_WINDOW(itf->theme_dialog), ++ _("Exec Error"), GTK_STOCK_DIALOG_ERROR, ++ _("Failed to run \"xfce4-session-logout\""), ++ error->message, ++ GTK_STOCK_CLOSE, GTK_RESPONSE_ACCEPT, NULL); ++ g_error_free(error); ++ } ++ } ++} ++ ++static gboolean ++handle_user_entered_dpi(Itf *itf) ++{ ++ GtkWidget *dlg, *topvbox, *hbox, *img, *lbl, *spin, *spacer; ++ gint resp; ++ ++ dlg = xfce_titled_dialog_new_with_buttons(_("Custom DPI"), ++ GTK_WINDOW(itf->theme_dialog), ++ GTK_DIALOG_NO_SEPARATOR ++ | GTK_DIALOG_DESTROY_WITH_PARENT, ++ GTK_STOCK_CANCEL, ++ GTK_RESPONSE_CANCEL, ++ GTK_STOCK_SAVE, ++ GTK_RESPONSE_ACCEPT, NULL); ++ gtk_dialog_set_default_response(GTK_DIALOG(dlg), GTK_RESPONSE_ACCEPT); ++ gtk_window_set_icon_name(GTK_WINDOW(dlg), "xfce4-ui"); ++ topvbox = GTK_DIALOG(dlg)->vbox; ++ ++ hbox = gtk_hbox_new(FALSE, BORDER); ++ gtk_widget_show(hbox); ++ gtk_box_pack_start(GTK_BOX(topvbox), hbox, FALSE, FALSE, 0); ++ ++ img = gtk_image_new_from_stock(GTK_STOCK_DIALOG_INFO, ++ GTK_ICON_SIZE_DIALOG); ++ gtk_widget_show(img); ++ gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); ++ ++ lbl = gtk_label_new(_("Enter your display's DPI below. Numbers that are multiples of 6 usually work best. The smaller the number, the smaller your fonts will look.")); ++ gtk_label_set_line_wrap(GTK_LABEL(lbl), TRUE); ++ gtk_misc_set_alignment(GTK_MISC(lbl), 0.0, 0.5); ++ gtk_widget_show(lbl); ++ gtk_box_pack_start(GTK_BOX(hbox), lbl, TRUE, TRUE, 0); ++ ++ spacer = gtk_alignment_new(0.5, 0.5, 1.0, 1.0); ++ gtk_widget_set_size_request(spacer, -1, 12); ++ gtk_widget_show(spacer); ++ gtk_box_pack_start(GTK_BOX(topvbox), spacer, FALSE, FALSE, 0); ++ ++ hbox = gtk_hbox_new(FALSE, BORDER); ++ gtk_widget_show(hbox); ++ gtk_box_pack_start(GTK_BOX(topvbox), hbox, FALSE, FALSE, 0); ++ ++ lbl = gtk_label_new_with_mnemonic(_("Custom _DPI:")); ++ gtk_widget_show(lbl); ++ gtk_box_pack_start(GTK_BOX(hbox), lbl, FALSE, FALSE, 0); ++ ++ spin = gtk_spin_button_new_with_range(24, 264, 1); ++ if(!current_dpi) { ++ /* FIXME: get the actual current dpi */ ++ gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin), 100); ++ } else ++ gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin), current_dpi); ++ gtk_widget_show(spin); ++ gtk_box_pack_start(GTK_BOX(hbox), spin, FALSE, FALSE, 0); ++ gtk_label_set_mnemonic_widget(GTK_LABEL(lbl), spin); ++ ++ resp = gtk_dialog_run(GTK_DIALOG(dlg)); ++ ++ if(GTK_RESPONSE_ACCEPT == resp) ++ current_dpi = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin)); ++ ++ gtk_widget_destroy(dlg); ++ ++ return (GTK_RESPONSE_ACCEPT == resp); ++} ++ ++static void ++on_dpi_combo_changed(GtkComboBox *combo, ++ gpointer user_data) ++{ ++ Itf *itf = (Itf *)user_data; ++ gint selected, old_dpi = current_dpi; ++ ++ selected = gtk_combo_box_get_active(combo); ++ ++ if(selected < G_N_ELEMENTS(xft_dpi_default_values)) ++ current_dpi = xft_dpi_default_values[selected]; ++ else { ++ gchar *text = gtk_combo_box_get_active_text(combo); ++ if(!strcmp(text, _("Other..."))) { ++ if(handle_user_entered_dpi(itf)) { ++ gint i; ++ gboolean done = FALSE; ++ ++ /* if there's an old custom dpi, remove it from the box */ ++ if(selected > G_N_ELEMENTS(xft_dpi_default_values)) ++ gtk_combo_box_remove_text(combo, selected - 1); ++ ++ /* make sure they didn't set one of our default values */ ++ for(i = 1; i < G_N_ELEMENTS(xft_dpi_default_values); ++i) { ++ if(xft_dpi_default_values[i] == current_dpi) { ++ g_signal_handlers_block_by_func(G_OBJECT(combo), ++ G_CALLBACK(on_dpi_combo_changed), ++ itf); ++ gtk_combo_box_set_active(combo, i); ++ g_signal_handlers_unblock_by_func(G_OBJECT(combo), ++ G_CALLBACK(on_dpi_combo_changed), ++ itf); ++ done = TRUE; ++ break; ++ } ++ } ++ ++ if(!done) { ++ /* if we get here, we have to create a new entry */ ++ gchar *str = g_strdup_printf("%d", current_dpi); ++ gtk_combo_box_insert_text(combo, ++ G_N_ELEMENTS(xft_dpi_default_values), ++ str); ++ ++ /* set the combo to the new entry, but block this func ++ * from getting called on the change */ ++ g_signal_handlers_block_by_func(G_OBJECT(combo), ++ G_CALLBACK(on_dpi_combo_changed), ++ itf); ++ gtk_combo_box_set_active(combo, ++ G_N_ELEMENTS(xft_dpi_default_values)); ++ g_signal_handlers_unblock_by_func(G_OBJECT(combo), ++ G_CALLBACK(on_dpi_combo_changed), ++ itf); ++ } ++ } else { ++ /* user canceled, so reset the last-selected item */ ++ gint i; ++ ++ for(i = 0; i <= G_N_ELEMENTS(xft_dpi_default_values); ++i) { ++ if(G_N_ELEMENTS(xft_dpi_default_values) == i ++ || xft_dpi_default_values[i] == current_dpi) ++ { ++ g_signal_handlers_block_by_func(G_OBJECT(combo), ++ G_CALLBACK(on_dpi_combo_changed), ++ itf); ++ gtk_combo_box_set_active(combo, i); ++ g_signal_handlers_unblock_by_func(G_OBJECT(combo), ++ G_CALLBACK(on_dpi_combo_changed), ++ itf); ++ break; ++ } ++ } ++ } ++ } else ++ current_dpi = atoi(text); /* we should be able to trust this */ ++ g_free(text); ++ } ++ ++ if(old_dpi != current_dpi) ++ handle_dpi_change(itf); ++} ++ + static gint sort_func(GtkTreeModel * model, GtkTreeIter * a, GtkTreeIter * b, gpointer user_data) + { + gchar *a_str = NULL; +@@ -672,6 +873,8 @@ + GdkPixbuf *icon; + GtkTreeIter iter; + GtkCellRenderer *cell[2]; ++ GtkWidget *hbox, *lbl; ++ gint i, selected = -1; + + dialog = g_new(Itf, 1); + +@@ -758,11 +961,50 @@ + gtk_widget_show(dialog->vbox3); + gtk_box_pack_start(GTK_BOX(dialog->hbox1), dialog->vbox3, TRUE, TRUE, 0); + ++ dialog->font_vbox = gtk_vbox_new(FALSE, BORDER); ++ gtk_widget_show(dialog->font_vbox); ++ + dialog->button3 = gtk_button_new(); + gtk_button_set_label(GTK_BUTTON(dialog->button3), current_font); + gtk_widget_show(dialog->button3); ++ gtk_box_pack_start(GTK_BOX(dialog->font_vbox), dialog->button3, FALSE, FALSE, 0); ++ ++ hbox = gtk_hbox_new(FALSE, BORDER); ++ gtk_widget_show(hbox); ++ gtk_box_pack_start(GTK_BOX(dialog->font_vbox), hbox, FALSE, FALSE, 0); ++ ++ lbl = gtk_label_new_with_mnemonic(_("Font _DPI:")); ++ gtk_widget_show(lbl); ++ gtk_box_pack_start(GTK_BOX(hbox), lbl, FALSE, FALSE, 0); ++ ++ for(i = 0; i < G_N_ELEMENTS(xft_dpi_default_values); ++i) { ++ if(xft_dpi_default_values[i] == current_dpi) { ++ selected = i; ++ break; ++ } ++ } ++ ++ dialog->dpi_combo = gtk_combo_box_new_text(); ++ for(i = 0; i < G_N_ELEMENTS(xft_dpi_default_entries); ++i) { ++ gtk_combo_box_append_text(GTK_COMBO_BOX(dialog->dpi_combo), ++ _(xft_dpi_default_entries[i])); ++ if(selected == i) ++ gtk_combo_box_set_active(GTK_COMBO_BOX(dialog->dpi_combo), selected); ++ } ++ if(-1 == selected) { ++ gchar *str = g_strdup_printf("%d", current_dpi); ++ gtk_combo_box_append_text(GTK_COMBO_BOX(dialog->dpi_combo), str); ++ gtk_combo_box_set_active(GTK_COMBO_BOX(dialog->dpi_combo), ++ G_N_ELEMENTS(xft_dpi_default_entries)); ++ g_free(str); ++ } ++ gtk_combo_box_append_text(GTK_COMBO_BOX(dialog->dpi_combo), ++ _("Other...")); ++ gtk_widget_show(dialog->dpi_combo); ++ gtk_box_pack_start(GTK_BOX(hbox), dialog->dpi_combo, TRUE, TRUE, 0); ++ gtk_label_set_mnemonic_widget(GTK_LABEL(lbl), dialog->dpi_combo); + +- dialog->frame2 = xfce_create_framebox_with_content (_("Font"), dialog->button3); ++ dialog->frame2 = xfce_create_framebox_with_content (_("Font"), dialog->font_vbox); + gtk_widget_show(dialog->frame2); + gtk_box_pack_start(GTK_BOX(dialog->vbox3), dialog->frame2, TRUE, FALSE, 0); + +@@ -919,6 +1161,7 @@ + + g_signal_connect(G_OBJECT(itf->theme_dialog), "response", G_CALLBACK(cb_dialog_response), itf->mcs_plugin); + g_signal_connect(G_OBJECT(itf->button3), "clicked", G_CALLBACK(show_font_selection), itf); ++ g_signal_connect(G_OBJECT(itf->dpi_combo), "changed", G_CALLBACK(on_dpi_combo_changed), itf); + g_signal_connect(G_OBJECT(itf->optionmenu1), "changed", G_CALLBACK(on_icons_changed), itf); + g_signal_connect(G_OBJECT(itf->accel_checkbox), "toggled", G_CALLBACK(on_change_accel_toggled), itf); + +@@ -1036,6 +1279,12 @@ + current_font = g_strdup(DEFAULT_FONT); + mcs_manager_set_string(mcs_plugin->manager, "Gtk/FontName", CHANNEL, current_font); + } ++ ++ setting = mcs_manager_setting_lookup(mcs_plugin->manager, "Xfce/XftDPI", CHANNEL); ++ if(setting) ++ current_dpi = setting->data.v_int; ++ else ++ mcs_manager_set_int(mcs_plugin->manager, "Xfce/XftDPI", CHANNEL, current_dpi); + + setting = mcs_manager_setting_lookup(mcs_plugin->manager, "Gtk/ToolbarStyle", CHANNEL); + if(setting) +@@ -1167,12 +1416,20 @@ + else + fprintf(fp, "Xft.hintstyle: hintnone\n"); + fprintf(fp, "Xft.rgba: %s\n", current_xft_rgba); ++ if(current_dpi > 0) ++ fprintf(fp, "Xft.dpi: %d\n", current_dpi); + fclose(fp); + + /* run xrdb to merge the new settings */ + cmd = g_strdup_printf("xrdb -nocpp -merge \"%s\"", path); + g_spawn_command_line_async(cmd, NULL); + g_free(cmd); ++ ++ if(!current_dpi) { ++ /* filter out Xft.dpi from xrdb */ ++ g_spawn_command_line_async("sh -c \"xrdb -query | grep -i -v '^Xft.dpi:' | xrdb\"", ++ NULL); ++ } + } + g_free(path); + } diff --git a/xfce-mcs-plugins.spec b/xfce-mcs-plugins.spec index ce9ab40..521cce6 100644 --- a/xfce-mcs-plugins.spec +++ b/xfce-mcs-plugins.spec @@ -1,11 +1,12 @@ Summary: Plugins for multi channel settings manager Name: xfce-mcs-plugins Version: 4.4.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL URL: http://www.xfce.org/ Source0: http://www.xfce.org/archive/xfce-4.4.1/src/xfce-mcs-plugins-4.4.1.tar.bz2 Patch: xfce-mcs-plugins-4.2.0-rh.patch +Patch1: xfce-mcs-plugins-4.4.1-dpi.patch Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: xfce-mcs-manager >= %{version} @@ -25,6 +26,7 @@ settings manager. %prep %setup -q %patch -p1 -b .fedora +%patch1 -p1 -b .dpi %build %configure @@ -54,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/*/*/apps/* %changelog +* Mon Jul 30 2007 Kevin Fenzi - 4.4.1-2 +- Add dpi interface option. (fixes #244286) + * Wed Apr 11 2007 Kevin Fenzi - 4.4.1-1 - Update to 4.4.1 From 1c18731f9f4ac55cac248df356d756a30e2aca2f Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 27 Aug 2007 21:16:44 +0000 Subject: [PATCH 10/20] Update License tag --- xfce-mcs-plugins.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xfce-mcs-plugins.spec b/xfce-mcs-plugins.spec index 521cce6..8694557 100644 --- a/xfce-mcs-plugins.spec +++ b/xfce-mcs-plugins.spec @@ -1,8 +1,8 @@ Summary: Plugins for multi channel settings manager Name: xfce-mcs-plugins Version: 4.4.1 -Release: 2%{?dist} -License: GPL +Release: 3%{?dist} +License: GPLv2 URL: http://www.xfce.org/ Source0: http://www.xfce.org/archive/xfce-4.4.1/src/xfce-mcs-plugins-4.4.1.tar.bz2 Patch: xfce-mcs-plugins-4.2.0-rh.patch @@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/*/*/apps/* %changelog +* Mon Aug 27 2007 Kevin Fenzi - 4.4.1-3 +- Update License tag + * Mon Jul 30 2007 Kevin Fenzi - 4.4.1-2 - Add dpi interface option. (fixes #244286) From 6ba072fb7b2692923946d409b7db96f8e5b78aa6 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 27 Aug 2007 21:20:01 +0000 Subject: [PATCH 11/20] Update License tag --- xfce-mcs-plugins.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xfce-mcs-plugins.spec b/xfce-mcs-plugins.spec index 521cce6..8694557 100644 --- a/xfce-mcs-plugins.spec +++ b/xfce-mcs-plugins.spec @@ -1,8 +1,8 @@ Summary: Plugins for multi channel settings manager Name: xfce-mcs-plugins Version: 4.4.1 -Release: 2%{?dist} -License: GPL +Release: 3%{?dist} +License: GPLv2 URL: http://www.xfce.org/ Source0: http://www.xfce.org/archive/xfce-4.4.1/src/xfce-mcs-plugins-4.4.1.tar.bz2 Patch: xfce-mcs-plugins-4.2.0-rh.patch @@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/*/*/apps/* %changelog +* Mon Aug 27 2007 Kevin Fenzi - 4.4.1-3 +- Update License tag + * Mon Jul 30 2007 Kevin Fenzi - 4.4.1-2 - Add dpi interface option. (fixes #244286) From 393629e150b4ed7235676398426b6d54c66412c2 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 3 Dec 2007 06:01:11 +0000 Subject: [PATCH 12/20] Update to 4.4.2 --- .cvsignore | 2 +- sources | 2 +- xfce-mcs-plugins-4.4.2-fedora.patch | 14 ++++++++++++++ xfce-mcs-plugins.spec | 15 ++++++++------- 4 files changed, 24 insertions(+), 9 deletions(-) create mode 100644 xfce-mcs-plugins-4.4.2-fedora.patch diff --git a/.cvsignore b/.cvsignore index 59947cf..f49e1c6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xfce-mcs-plugins-4.4.1.tar.bz2 +xfce-mcs-plugins-4.4.2.tar.bz2 diff --git a/sources b/sources index 986c5b7..232146e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -99f05b5ce95f24c205731565210aa8a9 xfce-mcs-plugins-4.4.1.tar.bz2 +77fcc929058de530d4f91eb25de851a1 xfce-mcs-plugins-4.4.2.tar.bz2 diff --git a/xfce-mcs-plugins-4.4.2-fedora.patch b/xfce-mcs-plugins-4.4.2-fedora.patch new file mode 100644 index 0000000..bcde2a9 --- /dev/null +++ b/xfce-mcs-plugins-4.4.2-fedora.patch @@ -0,0 +1,14 @@ +--- xfce-mcs-plugins-4.4.2/plugins/ui_plugin/ui_plugin.c.orig 2007-12-01 20:56:27.000000000 +0100 ++++ xfce-mcs-plugins-4.4.2/plugins/ui_plugin/ui_plugin.c 2007-12-01 20:59:17.000000000 +0100 +@@ -131,9 +131,9 @@ + #define RCFILE "gtk.xml" + #define CHANNEL "settings" + #define PLUGIN_NAME "ui" +-#define DEFAULT_THEME "Default" ++#define DEFAULT_THEME "Clearlooks" + #define INITIAL_THEME "Xfce" +-#define DEFAULT_ICON_THEME "hicolor" ++#define DEFAULT_ICON_THEME "Fedora" + #define INITIAL_ICON_THEME "Rodent" + #define DEFAULT_TOOLBAR_STYLE "icons" + #define DEFAULT_FONT "Sans 9" diff --git a/xfce-mcs-plugins.spec b/xfce-mcs-plugins.spec index 8694557..e0a6477 100644 --- a/xfce-mcs-plugins.spec +++ b/xfce-mcs-plugins.spec @@ -1,12 +1,11 @@ Summary: Plugins for multi channel settings manager Name: xfce-mcs-plugins -Version: 4.4.1 -Release: 3%{?dist} +Version: 4.4.2 +Release: 1%{?dist} License: GPLv2 URL: http://www.xfce.org/ -Source0: http://www.xfce.org/archive/xfce-4.4.1/src/xfce-mcs-plugins-4.4.1.tar.bz2 -Patch: xfce-mcs-plugins-4.2.0-rh.patch -Patch1: xfce-mcs-plugins-4.4.1-dpi.patch +Source0: http://www.xfce.org/archive/xfce-4.4.2/src/xfce-mcs-plugins-4.4.2.tar.bz2 +Patch: xfce-mcs-plugins-4.4.2-fedora.patch Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: xfce-mcs-manager >= %{version} @@ -25,8 +24,7 @@ settings manager. %prep %setup -q -%patch -p1 -b .fedora -%patch1 -p1 -b .dpi +%patch -p1 -b .theme %build %configure @@ -56,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/*/*/apps/* %changelog +* Sun Nov 18 2007 Kevin Fenzi - 4.4.2-1 +- Update to 4.4.2 + * Mon Aug 27 2007 Kevin Fenzi - 4.4.1-3 - Update License tag From 1db3261b77f5e707f8e175d6c59df796ba7aaa11 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 19 Dec 2007 03:06:11 +0000 Subject: [PATCH 13/20] Add patch for mouse button crash (fixes #425925) --- xfce-mcs-plugins-4.4.2-mouse.patch | 29 +++++++++++++++++++++++++++++ xfce-mcs-plugins.spec | 7 ++++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 xfce-mcs-plugins-4.4.2-mouse.patch diff --git a/xfce-mcs-plugins-4.4.2-mouse.patch b/xfce-mcs-plugins-4.4.2-mouse.patch new file mode 100644 index 0000000..f994370 --- /dev/null +++ b/xfce-mcs-plugins-4.4.2-mouse.patch @@ -0,0 +1,29 @@ +diff -Nur xfce-mcs-plugins-4.4.2.orig/plugins/mouse_plugin/mouse_plugin.c xfce-mcs-plugins-4.4.2/plugins/mouse_plugin/mouse_plugin.c +--- xfce-mcs-plugins-4.4.2.orig/plugins/mouse_plugin/mouse_plugin.c 2007-11-17 12:31:23.000000000 -0700 ++++ xfce-mcs-plugins-4.4.2/plugins/mouse_plugin/mouse_plugin.c 2007-12-17 17:51:03.000000000 -0700 +@@ -174,7 +174,7 @@ + unsigned char *buttons; + gint n_buttons, n_devices, i; + gint idx_1 = 0, idx_3 = 1; +- gsize buttons_capacity = 16; ++ gsize buttons_capacity = DEFAULT_PTR_MAP_SIZE; + + device_info = XListInputDevices (GDK_DISPLAY (), &n_devices); + +@@ -204,11 +204,12 @@ + continue; + } + +- n_buttons = XGetDeviceButtonMapping (GDK_DISPLAY (), device, buttons, DEFAULT_PTR_MAP_SIZE); +- if (n_buttons > DEFAULT_PTR_MAP_SIZE) ++ n_buttons = XGetDeviceButtonMapping (GDK_DISPLAY (), device, buttons, buttons_capacity); ++ if (n_buttons > buttons_capacity) + { +- buttons = g_alloca (n_buttons); +- n_buttons = XGetDeviceButtonMapping (GDK_DISPLAY (), device, buttons, n_buttons); ++ buttons = g_realloc (buttons, n_buttons); ++ buttons_capacity = n_buttons; ++ n_buttons = XGetDeviceButtonMapping (GDK_DISPLAY (), device, buttons, buttons_capacity); + } + + for (i = 0; i < n_buttons; i++) diff --git a/xfce-mcs-plugins.spec b/xfce-mcs-plugins.spec index e0a6477..43feb04 100644 --- a/xfce-mcs-plugins.spec +++ b/xfce-mcs-plugins.spec @@ -1,11 +1,12 @@ Summary: Plugins for multi channel settings manager Name: xfce-mcs-plugins Version: 4.4.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 URL: http://www.xfce.org/ Source0: http://www.xfce.org/archive/xfce-4.4.2/src/xfce-mcs-plugins-4.4.2.tar.bz2 Patch: xfce-mcs-plugins-4.4.2-fedora.patch +Patch1: xfce-mcs-plugins-4.4.2-mouse.patch Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: xfce-mcs-manager >= %{version} @@ -25,6 +26,7 @@ settings manager. %prep %setup -q %patch -p1 -b .theme +%patch1 -p1 -b .mouse %build %configure @@ -54,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/*/*/apps/* %changelog +* Mon Dec 17 2007 Kevin Fenzi - 4.4.2-2 +- Add patch for mouse button crash (fixes #425925) + * Sun Nov 18 2007 Kevin Fenzi - 4.4.2-1 - Update to 4.4.2 From 0029c46020bcc3d5682469ce0f4356724aa58db7 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 10 Feb 2008 23:38:21 +0000 Subject: [PATCH 14/20] Rebuild for gcc43 --- xfce-mcs-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce-mcs-plugins.spec b/xfce-mcs-plugins.spec index 43feb04..69d9513 100644 --- a/xfce-mcs-plugins.spec +++ b/xfce-mcs-plugins.spec @@ -1,7 +1,7 @@ Summary: Plugins for multi channel settings manager Name: xfce-mcs-plugins Version: 4.4.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 URL: http://www.xfce.org/ Source0: http://www.xfce.org/archive/xfce-4.4.2/src/xfce-mcs-plugins-4.4.2.tar.bz2 @@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/*/*/apps/* %changelog +* Sun Feb 10 2008 Kevin Fenzi - 4.4.2-3 +- Rebuild for gcc43 + * Mon Dec 17 2007 Kevin Fenzi - 4.4.2-2 - Add patch for mouse button crash (fixes #425925) From f5a3ce766c93e0c77412fbe6eca8b43a75e9fcaf Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Tue, 19 Feb 2008 20:43:45 +0000 Subject: [PATCH 15/20] - Use Nodoka Theme by default - Configure with --disable-static instead of removing .a files - Run gtk-update-icon-cache --- xfce-mcs-plugins-4.4.2-fedora.patch | 20 ++++++++++---------- xfce-mcs-plugins.spec | 26 +++++++++++++++++++------- 2 files changed, 29 insertions(+), 17 deletions(-) diff --git a/xfce-mcs-plugins-4.4.2-fedora.patch b/xfce-mcs-plugins-4.4.2-fedora.patch index bcde2a9..3cbc162 100644 --- a/xfce-mcs-plugins-4.4.2-fedora.patch +++ b/xfce-mcs-plugins-4.4.2-fedora.patch @@ -1,14 +1,14 @@ ---- xfce-mcs-plugins-4.4.2/plugins/ui_plugin/ui_plugin.c.orig 2007-12-01 20:56:27.000000000 +0100 -+++ xfce-mcs-plugins-4.4.2/plugins/ui_plugin/ui_plugin.c 2007-12-01 20:59:17.000000000 +0100 -@@ -131,9 +131,9 @@ - #define RCFILE "gtk.xml" +--- xfce-mcs-plugins-4.4.2.orig/plugins/ui_plugin/ui_plugin.c 2007-11-17 20:31:23.000000000 +0100 ++++ xfce-mcs-plugins-4.4.2/plugins/ui_plugin/ui_plugin.c 2008-02-19 05:59:20.000000000 +0100 +@@ -132,9 +132,9 @@ #define CHANNEL "settings" #define PLUGIN_NAME "ui" --#define DEFAULT_THEME "Default" -+#define DEFAULT_THEME "Clearlooks" - #define INITIAL_THEME "Xfce" --#define DEFAULT_ICON_THEME "hicolor" -+#define DEFAULT_ICON_THEME "Fedora" - #define INITIAL_ICON_THEME "Rodent" + #define DEFAULT_THEME "Default" +-#define INITIAL_THEME "Xfce" ++#define INITIAL_THEME "Nodoka" + #define DEFAULT_ICON_THEME "hicolor" +-#define INITIAL_ICON_THEME "Rodent" ++#define INITIAL_ICON_THEME "Fedora" #define DEFAULT_TOOLBAR_STYLE "icons" #define DEFAULT_FONT "Sans 9" + #define DEFAULT_XFT_ANTIALIAS 1 diff --git a/xfce-mcs-plugins.spec b/xfce-mcs-plugins.spec index 69d9513..d5adb55 100644 --- a/xfce-mcs-plugins.spec +++ b/xfce-mcs-plugins.spec @@ -1,11 +1,11 @@ Summary: Plugins for multi channel settings manager Name: xfce-mcs-plugins Version: 4.4.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 URL: http://www.xfce.org/ Source0: http://www.xfce.org/archive/xfce-4.4.2/src/xfce-mcs-plugins-4.4.2.tar.bz2 -Patch: xfce-mcs-plugins-4.4.2-fedora.patch +Patch0: xfce-mcs-plugins-4.4.2-fedora.patch Patch1: xfce-mcs-plugins-4.4.2-mouse.patch Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -25,24 +25,31 @@ settings manager. %prep %setup -q -%patch -p1 -b .theme +%patch0 -p1 -b .fedora %patch1 -p1 -b .mouse %build -%configure +%configure --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.a rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.la %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT +%post +touch --no-create %{_datadir}/icons/hicolor || : +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + %files -f %{name}.lang %defattr(-,root,root,-) %doc README COPYING AUTHORS @@ -50,12 +57,17 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/xfce4/doc/C %{_datadir}/xfce4/doc/fr %{_datadir}/xfce4/doc/it -%{_libdir}/xfce4/mcs-plugins/* +%{_libdir}/xfce4/mcs-plugins/*.so %{_datadir}/xfce-mcs-plugins/ %{_datadir}/applications/* -%{_datadir}/icons/*/*/apps/* +%{_datadir}/icons/hicolor/*/apps/* %changelog +* Tue Feb 19 2008 Christoph Wickert - 4.4.2-4 +- Use Nodoka Theme by default +- Configure with --disable-static instead of removing .a files +- Run gtk-update-icon-cache + * Sun Feb 10 2008 Kevin Fenzi - 4.4.2-3 - Rebuild for gcc43 From 0874fb231a4cc5bb4e0b0a5f553dc40b0d74de3d Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Thu, 21 Feb 2008 16:52:27 +0000 Subject: [PATCH 16/20] fix BuildRoot tag --- xfce-mcs-plugins.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xfce-mcs-plugins.spec b/xfce-mcs-plugins.spec index d5adb55..93e781e 100644 --- a/xfce-mcs-plugins.spec +++ b/xfce-mcs-plugins.spec @@ -8,7 +8,7 @@ Source0: http://www.xfce.org/archive/xfce-4.4.2/src/xfce-mcs-plugins-4.4.2.tar.b Patch0: xfce-mcs-plugins-4.4.2-fedora.patch Patch1: xfce-mcs-plugins-4.4.2-mouse.patch Group: User Interface/Desktops -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: xfce-mcs-manager >= %{version} BuildRequires: gettext BuildRequires: gtk2-devel >= 2.0.6 @@ -66,7 +66,7 @@ touch --no-create %{_datadir}/icons/hicolor || : * Tue Feb 19 2008 Christoph Wickert - 4.4.2-4 - Use Nodoka Theme by default - Configure with --disable-static instead of removing .a files -- Run gtk-update-icon-cache +- Run gtk-update-icon-cache * Sun Feb 10 2008 Kevin Fenzi - 4.4.2-3 - Rebuild for gcc43 From de4c1e0cd19ebc0b265d2a8558fdc0dda0de0db3 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 10 Feb 2009 00:52:48 +0000 Subject: [PATCH 17/20] This package is no longer used with the inclusion of the xfconf framework. --- Makefile | 21 -- dead.package | 1 + sources | 1 - xfce-mcs-plugins-4.2.0-rh.patch | 13 -- xfce-mcs-plugins-4.4.1-dpi.patch | 350 ---------------------------- xfce-mcs-plugins-4.4.2-fedora.patch | 14 -- xfce-mcs-plugins-4.4.2-mouse.patch | 29 --- xfce-mcs-plugins.spec | 179 -------------- 8 files changed, 1 insertion(+), 607 deletions(-) delete mode 100644 Makefile create mode 100644 dead.package delete mode 100644 sources delete mode 100644 xfce-mcs-plugins-4.2.0-rh.patch delete mode 100644 xfce-mcs-plugins-4.4.1-dpi.patch delete mode 100644 xfce-mcs-plugins-4.4.2-fedora.patch delete mode 100644 xfce-mcs-plugins-4.4.2-mouse.patch delete mode 100644 xfce-mcs-plugins.spec diff --git a/Makefile b/Makefile deleted file mode 100644 index 7df561d..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xfce-mcs-plugins -# $Id$ -NAME := xfce-mcs-plugins -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..fea988f --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +This package is no longer used with the inclusion of the xfconf framework. diff --git a/sources b/sources deleted file mode 100644 index 232146e..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -77fcc929058de530d4f91eb25de851a1 xfce-mcs-plugins-4.4.2.tar.bz2 diff --git a/xfce-mcs-plugins-4.2.0-rh.patch b/xfce-mcs-plugins-4.2.0-rh.patch deleted file mode 100644 index 83b29cb..0000000 --- a/xfce-mcs-plugins-4.2.0-rh.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- xfce-mcs-plugins-4.2.0/plugins/ui_plugin/ui_plugin.c.orig 2004-12-27 20:05:36.000000000 +0100 -+++ xfce-mcs-plugins-4.2.0/plugins/ui_plugin/ui_plugin.c 2005-01-24 11:01:02.291654459 +0100 -@@ -118,8 +118,8 @@ - #define CHANNEL "settings" - #define PLUGIN_NAME "ui" - #define DEFAULT_THEME "Default" --#define INITIAL_THEME "Xfce" --#define DEFAULT_ICON_THEME "hicolor" -+#define INITIAL_THEME "Bluecurve" -+#define DEFAULT_ICON_THEME "Bluecurve" - #define INITIAL_ICON_THEME "Rodent" - #define DEFAULT_TOOLBAR_STYLE "icons" - #define DEFAULT_FONT "Sans 9" diff --git a/xfce-mcs-plugins-4.4.1-dpi.patch b/xfce-mcs-plugins-4.4.1-dpi.patch deleted file mode 100644 index 2ba4e61..0000000 --- a/xfce-mcs-plugins-4.4.1-dpi.patch +++ /dev/null @@ -1,350 +0,0 @@ -diff -uNr xfce-mcs-plugins-4.4.1.orig/plugins/ui_plugin/ui_plugin.c xfce-mcs-plugins-4.4.1/plugins/ui_plugin/ui_plugin.c ---- xfce-mcs-plugins-4.4.1.orig/plugins/ui_plugin/ui_plugin.c 2007-02-17 00:38:20.000000000 -0800 -+++ xfce-mcs-plugins-4.4.1/plugins/ui_plugin/ui_plugin.c 2007-06-14 05:51:52.000000000 -0700 -@@ -16,6 +16,7 @@ - gnome theme-switcher capplet - (c) Jonathan Blandford - xfce4 mcs plugin - (c) 2002 Olivier Fourdan - (c) 2004-2006 Benedikt Meurer -+ (c) 2005-2007 Brian Tarircone - sub-pixel icons stolen from KDE :) - - */ -@@ -29,6 +30,10 @@ - #include - #endif - -+#ifdef HAVE_STDLIB_H -+#include -+#endif -+ - #include - - #include -@@ -112,6 +117,17 @@ - "aaaaaaaaaaaa" - }; - -+static const gchar *xft_dpi_default_entries[4] = -+{ -+ N_("System Default"), "75", "96", "100", -+}; -+static const gint xft_dpi_default_values[4] = -+{ -+ /* fortunately, 'Xft.dpi: 0' appears to be interpreted as -+ * 'system default' */ -+ 0, 75, 96, 100, -+}; -+ - #define RCDIR "mcs_settings" - #define OLDRCDIR "settings" - #define RCFILE "gtk.xml" -@@ -143,6 +159,7 @@ - static gint current_xft_hinting = DEFAULT_XFT_HINTING; - static gchar *current_xft_hintstyle = NULL; - static gchar *current_xft_rgba = NULL; -+static gint current_dpi = 0; - - static GtkTooltips *tooltips = NULL; - -@@ -167,7 +184,9 @@ - GtkWidget *label1; - GtkWidget *vbox3; - GtkWidget *frame2; -+ GtkWidget *font_vbox; - GtkWidget *button3; -+ GtkWidget *dpi_combo; - GtkWidget *frame3; - GtkWidget *optionmenu1; - GtkWidget *frame5; -@@ -499,6 +518,188 @@ - } - } - -+static void -+handle_dpi_change(Itf *itf) -+{ -+ gint r; -+ -+ mcs_manager_set_int(itf->mcs_plugin->manager, "Xfce/XftDPI", CHANNEL, current_dpi); -+ mcs_manager_notify(itf->mcs_plugin->manager, CHANNEL); -+ write_options(itf->mcs_plugin); -+ apply_xft_options(itf); -+ -+ r = xfce_message_dialog(GTK_WINDOW(itf->theme_dialog), _("DPI Changed"), -+ GTK_STOCK_DIALOG_INFO, -+ _("DPI was changed successfully"), -+ _("However, you may need to restart your session for the settings to take effect."), -+ XFCE_CUSTOM_STOCK_BUTTON, -+ _("Log Out Later"), -+ GTK_STOCK_CLOSE, GTK_RESPONSE_CANCEL, -+ XFCE_CUSTOM_STOCK_BUTTON, _("Log Out Now"), -+ GTK_STOCK_QUIT, GTK_RESPONSE_ACCEPT, NULL); -+ if(GTK_RESPONSE_ACCEPT == r) { -+ GError *error = NULL; -+ -+ if(!xfce_exec("xfce4-session-logout", FALSE, FALSE, &error)) { -+ xfce_message_dialog(GTK_WINDOW(itf->theme_dialog), -+ _("Exec Error"), GTK_STOCK_DIALOG_ERROR, -+ _("Failed to run \"xfce4-session-logout\""), -+ error->message, -+ GTK_STOCK_CLOSE, GTK_RESPONSE_ACCEPT, NULL); -+ g_error_free(error); -+ } -+ } -+} -+ -+static gboolean -+handle_user_entered_dpi(Itf *itf) -+{ -+ GtkWidget *dlg, *topvbox, *hbox, *img, *lbl, *spin, *spacer; -+ gint resp; -+ -+ dlg = xfce_titled_dialog_new_with_buttons(_("Custom DPI"), -+ GTK_WINDOW(itf->theme_dialog), -+ GTK_DIALOG_NO_SEPARATOR -+ | GTK_DIALOG_DESTROY_WITH_PARENT, -+ GTK_STOCK_CANCEL, -+ GTK_RESPONSE_CANCEL, -+ GTK_STOCK_SAVE, -+ GTK_RESPONSE_ACCEPT, NULL); -+ gtk_dialog_set_default_response(GTK_DIALOG(dlg), GTK_RESPONSE_ACCEPT); -+ gtk_window_set_icon_name(GTK_WINDOW(dlg), "xfce4-ui"); -+ topvbox = GTK_DIALOG(dlg)->vbox; -+ -+ hbox = gtk_hbox_new(FALSE, BORDER); -+ gtk_widget_show(hbox); -+ gtk_box_pack_start(GTK_BOX(topvbox), hbox, FALSE, FALSE, 0); -+ -+ img = gtk_image_new_from_stock(GTK_STOCK_DIALOG_INFO, -+ GTK_ICON_SIZE_DIALOG); -+ gtk_widget_show(img); -+ gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); -+ -+ lbl = gtk_label_new(_("Enter your display's DPI below. Numbers that are multiples of 6 usually work best. The smaller the number, the smaller your fonts will look.")); -+ gtk_label_set_line_wrap(GTK_LABEL(lbl), TRUE); -+ gtk_misc_set_alignment(GTK_MISC(lbl), 0.0, 0.5); -+ gtk_widget_show(lbl); -+ gtk_box_pack_start(GTK_BOX(hbox), lbl, TRUE, TRUE, 0); -+ -+ spacer = gtk_alignment_new(0.5, 0.5, 1.0, 1.0); -+ gtk_widget_set_size_request(spacer, -1, 12); -+ gtk_widget_show(spacer); -+ gtk_box_pack_start(GTK_BOX(topvbox), spacer, FALSE, FALSE, 0); -+ -+ hbox = gtk_hbox_new(FALSE, BORDER); -+ gtk_widget_show(hbox); -+ gtk_box_pack_start(GTK_BOX(topvbox), hbox, FALSE, FALSE, 0); -+ -+ lbl = gtk_label_new_with_mnemonic(_("Custom _DPI:")); -+ gtk_widget_show(lbl); -+ gtk_box_pack_start(GTK_BOX(hbox), lbl, FALSE, FALSE, 0); -+ -+ spin = gtk_spin_button_new_with_range(24, 264, 1); -+ if(!current_dpi) { -+ /* FIXME: get the actual current dpi */ -+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin), 100); -+ } else -+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin), current_dpi); -+ gtk_widget_show(spin); -+ gtk_box_pack_start(GTK_BOX(hbox), spin, FALSE, FALSE, 0); -+ gtk_label_set_mnemonic_widget(GTK_LABEL(lbl), spin); -+ -+ resp = gtk_dialog_run(GTK_DIALOG(dlg)); -+ -+ if(GTK_RESPONSE_ACCEPT == resp) -+ current_dpi = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin)); -+ -+ gtk_widget_destroy(dlg); -+ -+ return (GTK_RESPONSE_ACCEPT == resp); -+} -+ -+static void -+on_dpi_combo_changed(GtkComboBox *combo, -+ gpointer user_data) -+{ -+ Itf *itf = (Itf *)user_data; -+ gint selected, old_dpi = current_dpi; -+ -+ selected = gtk_combo_box_get_active(combo); -+ -+ if(selected < G_N_ELEMENTS(xft_dpi_default_values)) -+ current_dpi = xft_dpi_default_values[selected]; -+ else { -+ gchar *text = gtk_combo_box_get_active_text(combo); -+ if(!strcmp(text, _("Other..."))) { -+ if(handle_user_entered_dpi(itf)) { -+ gint i; -+ gboolean done = FALSE; -+ -+ /* if there's an old custom dpi, remove it from the box */ -+ if(selected > G_N_ELEMENTS(xft_dpi_default_values)) -+ gtk_combo_box_remove_text(combo, selected - 1); -+ -+ /* make sure they didn't set one of our default values */ -+ for(i = 1; i < G_N_ELEMENTS(xft_dpi_default_values); ++i) { -+ if(xft_dpi_default_values[i] == current_dpi) { -+ g_signal_handlers_block_by_func(G_OBJECT(combo), -+ G_CALLBACK(on_dpi_combo_changed), -+ itf); -+ gtk_combo_box_set_active(combo, i); -+ g_signal_handlers_unblock_by_func(G_OBJECT(combo), -+ G_CALLBACK(on_dpi_combo_changed), -+ itf); -+ done = TRUE; -+ break; -+ } -+ } -+ -+ if(!done) { -+ /* if we get here, we have to create a new entry */ -+ gchar *str = g_strdup_printf("%d", current_dpi); -+ gtk_combo_box_insert_text(combo, -+ G_N_ELEMENTS(xft_dpi_default_values), -+ str); -+ -+ /* set the combo to the new entry, but block this func -+ * from getting called on the change */ -+ g_signal_handlers_block_by_func(G_OBJECT(combo), -+ G_CALLBACK(on_dpi_combo_changed), -+ itf); -+ gtk_combo_box_set_active(combo, -+ G_N_ELEMENTS(xft_dpi_default_values)); -+ g_signal_handlers_unblock_by_func(G_OBJECT(combo), -+ G_CALLBACK(on_dpi_combo_changed), -+ itf); -+ } -+ } else { -+ /* user canceled, so reset the last-selected item */ -+ gint i; -+ -+ for(i = 0; i <= G_N_ELEMENTS(xft_dpi_default_values); ++i) { -+ if(G_N_ELEMENTS(xft_dpi_default_values) == i -+ || xft_dpi_default_values[i] == current_dpi) -+ { -+ g_signal_handlers_block_by_func(G_OBJECT(combo), -+ G_CALLBACK(on_dpi_combo_changed), -+ itf); -+ gtk_combo_box_set_active(combo, i); -+ g_signal_handlers_unblock_by_func(G_OBJECT(combo), -+ G_CALLBACK(on_dpi_combo_changed), -+ itf); -+ break; -+ } -+ } -+ } -+ } else -+ current_dpi = atoi(text); /* we should be able to trust this */ -+ g_free(text); -+ } -+ -+ if(old_dpi != current_dpi) -+ handle_dpi_change(itf); -+} -+ - static gint sort_func(GtkTreeModel * model, GtkTreeIter * a, GtkTreeIter * b, gpointer user_data) - { - gchar *a_str = NULL; -@@ -672,6 +873,8 @@ - GdkPixbuf *icon; - GtkTreeIter iter; - GtkCellRenderer *cell[2]; -+ GtkWidget *hbox, *lbl; -+ gint i, selected = -1; - - dialog = g_new(Itf, 1); - -@@ -758,11 +961,50 @@ - gtk_widget_show(dialog->vbox3); - gtk_box_pack_start(GTK_BOX(dialog->hbox1), dialog->vbox3, TRUE, TRUE, 0); - -+ dialog->font_vbox = gtk_vbox_new(FALSE, BORDER); -+ gtk_widget_show(dialog->font_vbox); -+ - dialog->button3 = gtk_button_new(); - gtk_button_set_label(GTK_BUTTON(dialog->button3), current_font); - gtk_widget_show(dialog->button3); -+ gtk_box_pack_start(GTK_BOX(dialog->font_vbox), dialog->button3, FALSE, FALSE, 0); -+ -+ hbox = gtk_hbox_new(FALSE, BORDER); -+ gtk_widget_show(hbox); -+ gtk_box_pack_start(GTK_BOX(dialog->font_vbox), hbox, FALSE, FALSE, 0); -+ -+ lbl = gtk_label_new_with_mnemonic(_("Font _DPI:")); -+ gtk_widget_show(lbl); -+ gtk_box_pack_start(GTK_BOX(hbox), lbl, FALSE, FALSE, 0); -+ -+ for(i = 0; i < G_N_ELEMENTS(xft_dpi_default_values); ++i) { -+ if(xft_dpi_default_values[i] == current_dpi) { -+ selected = i; -+ break; -+ } -+ } -+ -+ dialog->dpi_combo = gtk_combo_box_new_text(); -+ for(i = 0; i < G_N_ELEMENTS(xft_dpi_default_entries); ++i) { -+ gtk_combo_box_append_text(GTK_COMBO_BOX(dialog->dpi_combo), -+ _(xft_dpi_default_entries[i])); -+ if(selected == i) -+ gtk_combo_box_set_active(GTK_COMBO_BOX(dialog->dpi_combo), selected); -+ } -+ if(-1 == selected) { -+ gchar *str = g_strdup_printf("%d", current_dpi); -+ gtk_combo_box_append_text(GTK_COMBO_BOX(dialog->dpi_combo), str); -+ gtk_combo_box_set_active(GTK_COMBO_BOX(dialog->dpi_combo), -+ G_N_ELEMENTS(xft_dpi_default_entries)); -+ g_free(str); -+ } -+ gtk_combo_box_append_text(GTK_COMBO_BOX(dialog->dpi_combo), -+ _("Other...")); -+ gtk_widget_show(dialog->dpi_combo); -+ gtk_box_pack_start(GTK_BOX(hbox), dialog->dpi_combo, TRUE, TRUE, 0); -+ gtk_label_set_mnemonic_widget(GTK_LABEL(lbl), dialog->dpi_combo); - -- dialog->frame2 = xfce_create_framebox_with_content (_("Font"), dialog->button3); -+ dialog->frame2 = xfce_create_framebox_with_content (_("Font"), dialog->font_vbox); - gtk_widget_show(dialog->frame2); - gtk_box_pack_start(GTK_BOX(dialog->vbox3), dialog->frame2, TRUE, FALSE, 0); - -@@ -919,6 +1161,7 @@ - - g_signal_connect(G_OBJECT(itf->theme_dialog), "response", G_CALLBACK(cb_dialog_response), itf->mcs_plugin); - g_signal_connect(G_OBJECT(itf->button3), "clicked", G_CALLBACK(show_font_selection), itf); -+ g_signal_connect(G_OBJECT(itf->dpi_combo), "changed", G_CALLBACK(on_dpi_combo_changed), itf); - g_signal_connect(G_OBJECT(itf->optionmenu1), "changed", G_CALLBACK(on_icons_changed), itf); - g_signal_connect(G_OBJECT(itf->accel_checkbox), "toggled", G_CALLBACK(on_change_accel_toggled), itf); - -@@ -1036,6 +1279,12 @@ - current_font = g_strdup(DEFAULT_FONT); - mcs_manager_set_string(mcs_plugin->manager, "Gtk/FontName", CHANNEL, current_font); - } -+ -+ setting = mcs_manager_setting_lookup(mcs_plugin->manager, "Xfce/XftDPI", CHANNEL); -+ if(setting) -+ current_dpi = setting->data.v_int; -+ else -+ mcs_manager_set_int(mcs_plugin->manager, "Xfce/XftDPI", CHANNEL, current_dpi); - - setting = mcs_manager_setting_lookup(mcs_plugin->manager, "Gtk/ToolbarStyle", CHANNEL); - if(setting) -@@ -1167,12 +1416,20 @@ - else - fprintf(fp, "Xft.hintstyle: hintnone\n"); - fprintf(fp, "Xft.rgba: %s\n", current_xft_rgba); -+ if(current_dpi > 0) -+ fprintf(fp, "Xft.dpi: %d\n", current_dpi); - fclose(fp); - - /* run xrdb to merge the new settings */ - cmd = g_strdup_printf("xrdb -nocpp -merge \"%s\"", path); - g_spawn_command_line_async(cmd, NULL); - g_free(cmd); -+ -+ if(!current_dpi) { -+ /* filter out Xft.dpi from xrdb */ -+ g_spawn_command_line_async("sh -c \"xrdb -query | grep -i -v '^Xft.dpi:' | xrdb\"", -+ NULL); -+ } - } - g_free(path); - } diff --git a/xfce-mcs-plugins-4.4.2-fedora.patch b/xfce-mcs-plugins-4.4.2-fedora.patch deleted file mode 100644 index 3cbc162..0000000 --- a/xfce-mcs-plugins-4.4.2-fedora.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- xfce-mcs-plugins-4.4.2.orig/plugins/ui_plugin/ui_plugin.c 2007-11-17 20:31:23.000000000 +0100 -+++ xfce-mcs-plugins-4.4.2/plugins/ui_plugin/ui_plugin.c 2008-02-19 05:59:20.000000000 +0100 -@@ -132,9 +132,9 @@ - #define CHANNEL "settings" - #define PLUGIN_NAME "ui" - #define DEFAULT_THEME "Default" --#define INITIAL_THEME "Xfce" -+#define INITIAL_THEME "Nodoka" - #define DEFAULT_ICON_THEME "hicolor" --#define INITIAL_ICON_THEME "Rodent" -+#define INITIAL_ICON_THEME "Fedora" - #define DEFAULT_TOOLBAR_STYLE "icons" - #define DEFAULT_FONT "Sans 9" - #define DEFAULT_XFT_ANTIALIAS 1 diff --git a/xfce-mcs-plugins-4.4.2-mouse.patch b/xfce-mcs-plugins-4.4.2-mouse.patch deleted file mode 100644 index f994370..0000000 --- a/xfce-mcs-plugins-4.4.2-mouse.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -Nur xfce-mcs-plugins-4.4.2.orig/plugins/mouse_plugin/mouse_plugin.c xfce-mcs-plugins-4.4.2/plugins/mouse_plugin/mouse_plugin.c ---- xfce-mcs-plugins-4.4.2.orig/plugins/mouse_plugin/mouse_plugin.c 2007-11-17 12:31:23.000000000 -0700 -+++ xfce-mcs-plugins-4.4.2/plugins/mouse_plugin/mouse_plugin.c 2007-12-17 17:51:03.000000000 -0700 -@@ -174,7 +174,7 @@ - unsigned char *buttons; - gint n_buttons, n_devices, i; - gint idx_1 = 0, idx_3 = 1; -- gsize buttons_capacity = 16; -+ gsize buttons_capacity = DEFAULT_PTR_MAP_SIZE; - - device_info = XListInputDevices (GDK_DISPLAY (), &n_devices); - -@@ -204,11 +204,12 @@ - continue; - } - -- n_buttons = XGetDeviceButtonMapping (GDK_DISPLAY (), device, buttons, DEFAULT_PTR_MAP_SIZE); -- if (n_buttons > DEFAULT_PTR_MAP_SIZE) -+ n_buttons = XGetDeviceButtonMapping (GDK_DISPLAY (), device, buttons, buttons_capacity); -+ if (n_buttons > buttons_capacity) - { -- buttons = g_alloca (n_buttons); -- n_buttons = XGetDeviceButtonMapping (GDK_DISPLAY (), device, buttons, n_buttons); -+ buttons = g_realloc (buttons, n_buttons); -+ buttons_capacity = n_buttons; -+ n_buttons = XGetDeviceButtonMapping (GDK_DISPLAY (), device, buttons, buttons_capacity); - } - - for (i = 0; i < n_buttons; i++) diff --git a/xfce-mcs-plugins.spec b/xfce-mcs-plugins.spec deleted file mode 100644 index 93e781e..0000000 --- a/xfce-mcs-plugins.spec +++ /dev/null @@ -1,179 +0,0 @@ -Summary: Plugins for multi channel settings manager -Name: xfce-mcs-plugins -Version: 4.4.2 -Release: 4%{?dist} -License: GPLv2 -URL: http://www.xfce.org/ -Source0: http://www.xfce.org/archive/xfce-4.4.2/src/xfce-mcs-plugins-4.4.2.tar.bz2 -Patch0: xfce-mcs-plugins-4.4.2-fedora.patch -Patch1: xfce-mcs-plugins-4.4.2-mouse.patch -Group: User Interface/Desktops -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: xfce-mcs-manager >= %{version} -BuildRequires: gettext -BuildRequires: gtk2-devel >= 2.0.6 -BuildRequires: xfce-mcs-manager-devel >= %{version} -BuildRequires: libxfcegui4-devel >= %{version} -BuildRequires: libxfce4util-devel >= %{version} -BuildRequires: libxfce4mcs-devel >= %{version} -BuildRequires: imake -BuildRequires: libXt-devel - -%description -This package inlcudes a set of plugins for the multi channel -settings manager. - -%prep -%setup -q -%patch0 -p1 -b .fedora -%patch1 -p1 -b .mouse - -%build -%configure --disable-static -make %{?_smp_mflags} - -%install -rm -rf $RPM_BUILD_ROOT - -make install DESTDIR=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.la -%find_lang %{name} - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -touch --no-create %{_datadir}/icons/hicolor || : -%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : - -%postun -touch --no-create %{_datadir}/icons/hicolor || : -%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : - -%files -f %{name}.lang -%defattr(-,root,root,-) -%doc README COPYING AUTHORS -%docdir %{_datadir}/xfce4/doc -%{_datadir}/xfce4/doc/C -%{_datadir}/xfce4/doc/fr -%{_datadir}/xfce4/doc/it -%{_libdir}/xfce4/mcs-plugins/*.so -%{_datadir}/xfce-mcs-plugins/ -%{_datadir}/applications/* -%{_datadir}/icons/hicolor/*/apps/* - -%changelog -* Tue Feb 19 2008 Christoph Wickert - 4.4.2-4 -- Use Nodoka Theme by default -- Configure with --disable-static instead of removing .a files -- Run gtk-update-icon-cache - -* Sun Feb 10 2008 Kevin Fenzi - 4.4.2-3 -- Rebuild for gcc43 - -* Mon Dec 17 2007 Kevin Fenzi - 4.4.2-2 -- Add patch for mouse button crash (fixes #425925) - -* Sun Nov 18 2007 Kevin Fenzi - 4.4.2-1 -- Update to 4.4.2 - -* Mon Aug 27 2007 Kevin Fenzi - 4.4.1-3 -- Update License tag - -* Mon Jul 30 2007 Kevin Fenzi - 4.4.1-2 -- Add dpi interface option. (fixes #244286) - -* Wed Apr 11 2007 Kevin Fenzi - 4.4.1-1 -- Update to 4.4.1 - -* Tue Apr 3 2007 Kevin Fenzi - 4.4.0-2 -- Own some unowned directories - -* Sun Jan 21 2007 Kevin Fenzi - 4.4.0-1 -- Update to 4.4.0 - -* Fri Nov 10 2006 Kevin Fenzi - 4.3.99.2-1 -- Update to 4.3.99.2 - -* Thu Oct 5 2006 Kevin Fenzi - 4.3.99.1-3 -- Fix defattr - -* Wed Oct 4 2006 Kevin Fenzi - 4.3.99.1-2 -- Bump release for devel checkin - -* Sun Sep 3 2006 Kevin Fenzi - 4.3.99.1-1 -- Upgrade to 4.3.99.1 - -* Wed Jul 12 2006 Kevin Fenzi - 4.3.90.2-1 -- Update to 4.3.90.2 - -* Mon May 8 2006 Kevin Fenzi - 4.3.90.1-1 -- Update to 4.3.90.1 - -* Mon Nov 7 2005 Kevin Fenzi - 4.2.3-1.fc5 -- Update to 4.2.3 -- Added dist tag -- Added doc/he files -- Removed 0 len TODO file - -* Tue May 17 2005 Kevin Fenzi - 4.2.2-1.fc4 -- Update to 4.2.2 -- Add doc/fr directory - -* Fri Mar 25 2005 Kevin Fenzi - 4.2.1-4.fc4 -- lowercase Release - -* Wed Mar 23 2005 Kevin Fenzi - 4.2.1-3.FC4 -- Removed unneeded la/a files - -* Sat Mar 19 2005 Warren Togami - 4.2.1-2 -- remove explicit gtk2 req - -* Tue Mar 15 2005 Kevin Fenzi - 4.2.1-1 -- Updated to 4.2.1 version - -* Sun Mar 6 2005 Kevin Fenzi - 4.2.0-2 -- Capitalized first letter of Summary in devel section to quiet rpmlint - -* Mon Jan 24 2005 Than Ngo 4.2.0-1 -- 4.2.0 - -* Wed Dec 08 2004 Than Ngo 4.1.99.1-1 -- update to 4.2 rc1 - -* Thu Sep 02 2004 Than Ngo 4.0.6-2 -- use find_lang macro -- cleanup specfile - -* Mon Jul 19 2004 Than Ngo 4.0.6-1 -- update to 4.0.6 -- remove some unneeded patch files, which are included in new upstream - -* Tue Jun 15 2004 Elliot Lee -- rebuilt - -* Tue Apr 20 2004 Than Ngo 4.0.5-2 -- Fix bug in default icon theme selection, thanks to Olivier Fourdan -- Add support for icon theme, Change defaults for fedora, #119647, thanks to Olivier Fourdan - -* Thu Apr 15 2004 Than Ngo 4.0.5-1 -- update to 4.0.5 - -* Tue Mar 02 2004 Elliot Lee -- rebuilt - -* Fri Feb 13 2004 Elliot Lee -- rebuilt - -* Tue Jan 27 2004 Than Ngo 4.0.3-2 -- fixed dependant libraries check on x86_64 - -* Fri Jan 09 2004 Than Ngo 4.0.3-1 -- add libxfce4util-devel, libxfcegui4-devel in BuildRequires -- 4.0.3 release - -* Thu Dec 25 2003 Than Ngo 4.0.2-1 -- 4.0.2 release - -* Tue Dec 16 2003 Than Ngo 4.0.1-1 -- initial build From d691d7b1fcfe466733c6972022315adf4c98cd08 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:32:41 +0000 Subject: [PATCH 18/20] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7df561d..294af23 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := xfce-mcs-plugins SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 17dff2c782358d1d06aeb0c9e0978c90e825be12 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:42:23 +0000 Subject: [PATCH 19/20] dist-git conversion --- .cvsignore => .gitignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .cvsignore => .gitignore (100%) diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore From a97fd6e565b43f5722ec7db032ec3ac6d432ba2d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:42:27 +0000 Subject: [PATCH 20/20] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 294af23..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xfce-mcs-plugins -# $Id$ -NAME := xfce-mcs-plugins -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index d5b6362..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -FC-6