Hello community, here is the log from the commit of package xfce4-panel-plugins for openSUSE:Factory checked in at Tue Jan 25 13:20:51 CET 2011. -------- --- xfce4-panel-plugins/xfce4-panel-plugins.changes 2010-12-14 20:30:54.000000000 +0100 +++ /mounts/work_src_done/STABLE/xfce4-panel-plugins/xfce4-panel-plugins.changes 2011-01-07 15:16:30.000000000 +0100 @@ -1,0 +2,127 @@ +Fri Jan 7 14:12:59 UTC 2011 - gber@opensuse.org + +- added xfce4-sensors-plugin-1.0.0-fix-uninitialized-memory.patch + which fixes a crash due to an unitialized pointer when no sensors + are found + +------------------------------------------------------------------- +Tue Jan 4 19:57:05 UTC 2011 - gber@opensuse.org + +- fixed typo in + xfce4-smartbookmark-plugin-0.4.2-fix-desktop-file.patch + +------------------------------------------------------------------- +Sat Jan 1 14:30:10 UTC 2011 - gber@opensuse.org + +- only handle xfce4-notes-autostart.desktop on >= 11.4 + +------------------------------------------------------------------- +Sat Jan 1 12:44:32 UTC 2011 - gber@opensuse.org + +- changed build dependency in order to fix compatibility with 11.3 +- added xfce4-notes-plugin-1.7.7-fix-desktop-file.patch, + xfce4-quicklauncher-plugin-1.9.4-fix-desktop-file.patch, and + xfce4-smartbookmark-plugin-0.4.2-fix-desktop-file.patch in order + to fix their desktop files which prevented them from loading +- changed xfce4-panel-plugins-rpmlintrc to ignore + devel-file-in-non-devel-package due to panel plugins + +------------------------------------------------------------------- +Fri Dec 31 21:38:53 UTC 2010 - gber@opensuse.org + +- streamlined build dependencies, added libcdio, libcddb, + libunique, libmpd +- use more pkgconfig symbols for dependencies +- remove unsupported locales +- improved summaries/descriptions +- no need to own %%{_libexecdir}/xfce4 and + %%{_libexecdir}/xfce4/panel-plugins since they are now owned by + xfce4-panel-plugin +- made xfce4-panel-plugin-governor depend on hal +- made xfce4-panel-plugin-places depend on thunar-vfs +- made xfce4-panel-plugin-clipman and xfce4-panel-plugin-notes + depend on xfconf +- split off xfce4-panel-plugin-clipman-doc subpackage +- split off xfce4-panel-plugin-sensors-devel +- use %suse_update_desktop_file on .desktop files +- marked configuration files as such +- improved summaries/descriptions +- renamed rpmlintrc to xfce4-panel-plugins-rpmlintrc +- updated fsguard to version 1.0.0 + - translated to 11 new languages, for a total of 38 + - detect the file manager automatically + - replace limits in MB to percents +- updated netload plugin to 1.0.0 + - translated in 23 more languages, for a total of 36, 32 of which + are fully translations + - add a unique icon + - bugfixes +- dropped xfce4-netload-plugin-0.4.0-fix-build-with-4.7.patch and + xfce4-netload-plugin-0.4.0.patch +- updated time-out to 1.0.0 + - translated into a total of 31 languages, with 15 at 100% + - allow setting the time with a precision in seconds, rather than + minutes + - added an about dialog + - new optional resume button to be pushed at the end of the pause + - new progress bar in the lock screen +- updated systemload to 1.0.0 + - translated into 34 languages, including 13 with a complete + translation + - adjust the way free memory is calculated + - improve the accuracy of CPU activity measurements + - make the plugin more compact visually +- updated verve to 1.0.0 + - translated into 7 more languages, for a total of 37, 36 of + which are full translations +- dropped xfce4-verve-plugin-0.3.6-fix-build-with-4.7.patch +- backported xfce4-clipman-plugin-1.1.3-catch-null-value.patch from + git in order to fix a crash due to dereferencing a NULL pointer +- backported xfce4-clipman-plugin-1.1.3-fix-memory-leak.patch from + git in order to fix a memory leak +- dropped xfce4-clipman-plugin-1.1.3.patch as there is no need to + patch the desktop file category +- added xfce4-xkb-plugin-0.5.3.3-check-retval.patch in order to fix + a crash due to not checking the return value of + gtk_combo_box_get_active_iter +- added xfce4-xkb-plugin-0.5.3.3-do-not-free-stack-memory.patch in + order prevent freeing stack memory +- added xfce4-xkb-plugin-0.5.3.3-fix-array-size.patch in order to + fix a creash due to an unterminated array +- updated sensors to 1.0.0 + - made min/max values for Fahrenheit work + - maximum number of lines specifiable for text view + - labels in text view possible + - remember window size of configuration dialog + - respect "suppress messages" for error dialogs with acpi/sysfs +- dropped xfce4-sensors-plugin-0.10.99.6-fix-build-with-4.7.patch +- dropped xfce4-sensors-plugin-0.10.99.6-initialize-pointers.patch +- dropped xfce4-sensors-plugin-0.10.99.6.patch +- backported xfce4-sensors-plugin-1.0.0-fix-memory-leaks.patch from + git in order to fix a memory leak +- backported xfce4-sensors-plugin-1.0.0-fix-build-with-4.7.patch in + order to fix build with newer panel +- backported xfce4-battery-plugin-0.5.1-no-battery.patch from git + in order to correctly handle a missing battery +- backported xfce4-battery-plugin-0.5.1-use-sysfs.patch from git + in order to get correct infomration for some systems from sysfs +- backported + xfce4-battery-plugin-0.5.1-fix-fan-temperature-detection.patch + in order to fix fan and temperature detection +- added xfce4-genmon-plugin-3.2-prevent-zombies.patch from Debian + in order to prevent zombie processes +- added xfce4-genmon-plugin-3.2-close-unused-pipes.patch from + Debian in order to close unused pipes +- backported xfce4-quicklauncher-plugin-1.9.4-save-settings.patch + from git in order to make quicklaunches save its settings +- added + xfce4-quicklauncher-plugin-1.9.4-fix-parameters-launcher.patch + in order to fix the "Parameters" launcher +- added xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch from + Debian in order to lauch applications on the right screen i + multiscreen setups +- added + xfce4-quicklauncher-plugin-1.9.4-add-missing-en-translation.patch + from Debian in order to add the missing English translation + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- rpmlintrc xfce4-clipman-plugin-1.1.3.patch xfce4-fsguard-plugin-0.4.2.tar.bz2 xfce4-netload-plugin-0.4.0-fix-build-with-4.7.patch xfce4-netload-plugin-0.4.0.patch xfce4-netload-plugin-0.4.0.tar.bz2 xfce4-sensors-plugin-0.10.99.6-fix-build-with-4.7.patch xfce4-sensors-plugin-0.10.99.6-initialize-pointers.patch xfce4-sensors-plugin-0.10.99.6.patch xfce4-sensors-plugin-0.10.99.6.tar.bz2 xfce4-systemload-plugin-0.4.2.tar.bz2 xfce4-time-out-plugin-0.1.1.tar.bz2 xfce4-verve-plugin-0.3.6-fix-build-with-4.7.patch xfce4-verve-plugin-0.3.6.tar.bz2 New: ---- xfce4-battery-plugin-0.5.1-fix-fan-temperature-detection.patch xfce4-battery-plugin-0.5.1-no-battery.patch xfce4-battery-plugin-0.5.1-use-sysfs.patch xfce4-clipman-plugin-1.1.3-catch-null-value.patch xfce4-clipman-plugin-1.1.3-fix-memory-leak.patch xfce4-fsguard-plugin-1.0.0.tar.bz2 xfce4-genmon-plugin-3.2-close-unused-pipes.patch xfce4-genmon-plugin-3.2-prevent-zombies.patch xfce4-netload-plugin-1.0.0.tar.bz2 xfce4-notes-plugin-1.7.7-fix-desktop-file.patch xfce4-panel-plugins-rpmlintrc xfce4-quicklauncher-plugin-1.9.4-add-missing-en-translation.patch xfce4-quicklauncher-plugin-1.9.4-fix-desktop-file.patch xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch xfce4-quicklauncher-plugin-1.9.4-fix-parameters-launcher.patch xfce4-quicklauncher-plugin-1.9.4-save-settings.patch xfce4-sensors-plugin-1.0.0-fix-build-with-4.7.patch xfce4-sensors-plugin-1.0.0-fix-memory-leaks.patch xfce4-sensors-plugin-1.0.0-fix-uninitialized-memory.patch xfce4-sensors-plugin-1.0.0.tar.bz2 xfce4-smartbookmark-plugin-0.4.2-fix-desktop-file.patch xfce4-systemload-plugin-1.0.0.tar.bz2 xfce4-time-out-plugin-1.0.0.tar.bz2 xfce4-verve-plugin-1.0.0.tar.bz2 xfce4-xkb-plugin-0.5.3.3-check-retval.patch xfce4-xkb-plugin-0.5.3.3-do-not-free-stack-memory.patch xfce4-xkb-plugin-0.5.3.3-fix-array-size.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-panel-plugins.spec ++++++ ++++ 1407 lines (skipped) ++++ between xfce4-panel-plugins/xfce4-panel-plugins.spec ++++ and /mounts/work_src_done/STABLE/xfce4-panel-plugins/xfce4-panel-plugins.spec ++++++ xfce4-battery-plugin-0.5.1-fix-fan-temperature-detection.patch ++++++ diff -ur xfce4-battery-plugin-0.5.1.orig/panel-plugin/libacpi.c xfce4-battery-plugin-0.5.1/panel-plugin/libacpi.c --- xfce4-battery-plugin-0.5.1.orig/panel-plugin/libacpi.c 2008-09-04 23:10:07.000000000 +0200 +++ xfce4-battery-plugin-0.5.1/panel-plugin/libacpi.c 2011-01-01 01:21:47.000000000 +0100 @@ -30,6 +30,7 @@ #include <stdlib.h> #include <sys/types.h> #include <dirent.h> +#include <glob.h> #if HAVE_SYSCTL @@ -181,6 +182,22 @@ #endif #endif +/* expand file name and fopen first match */ +static FILE * +fopen_glob(const char *name, const char *mode) +{ + glob_t globbuf; + FILE *fd; + + if (glob(name, 0, NULL, &globbuf) != 0) + return NULL; + + fd = fopen(globbuf.gl_pathv[0], mode); + globfree(&globbuf); + + return fd; +} + /* see if we have ACPI support */ int check_acpi(void) { @@ -695,7 +712,7 @@ else return 0; } proc_fan_status="/proc/acpi/fan/*/state"; - if ( (fp=fopen(proc_fan_status, "r")) == NULL ) return 0; + if ( (fp=fopen_glob(proc_fan_status, "r")) == NULL ) return 0; fgets(line,255,fp); fclose(fp); @@ -708,10 +725,10 @@ { #ifdef __linux__ FILE *fp; - char *proc_temperature="/proc/acpi/thermal_zone/*0/temperature"; + char *proc_temperature="/proc/acpi/thermal_zone/*/temperature"; static char *p,line[256]; - if ( (fp=fopen(proc_temperature, "r")) == NULL) return NULL; + if ( (fp=fopen_glob(proc_temperature, "r")) == NULL) return NULL; fgets(line,255,fp); fclose(fp); p=strtok(line," "); ++++++ xfce4-battery-plugin-0.5.1-no-battery.patch ++++++ diff -ur xfce4-battery-plugin-0.5.1.orig/panel-plugin/battery.c xfce4-battery-plugin-0.5.1/panel-plugin/battery.c --- xfce4-battery-plugin-0.5.1.orig/panel-plugin/battery.c 2008-09-04 23:10:07.000000000 +0200 +++ xfce4-battery-plugin-0.5.1/panel-plugin/battery.c 2011-01-01 01:20:51.000000000 +0100 @@ -5,6 +5,7 @@ * Copyright (c) 2003 Edscott Wilson Garcia <edscott@users.sourceforge.net> * Copyright (c) 2005 Eduard Roccatello <eduard@xfce.org> * Copyright (c) 2006 Nick Schermer <nick@xfce.org> + * Copyright (c) 2010 Florian Rivoal <frivoal@xfce.org> * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free @@ -491,7 +492,12 @@ if(acline) { - char *t=(charge<99.9)?_("(Charging from AC)"):_("(AC on-line)"); + char *t; + if((battmon->method == BM_USE_ACPI) && (acpiinfo->present == 0)) { + t=_("(No battery, AC on-line)"); + } else { + t=(charge<99.9)?_("(Charging from AC)"):_("(AC on-line)"); + } if(battmon->options.tooltip_display_percentage) { g_snprintf(buffer, sizeof(buffer), "%d%% %s", charge,t); } ++++++ xfce4-battery-plugin-0.5.1-use-sysfs.patch ++++++ diff -ur xfce4-battery-plugin-0.5.1.orig/panel-plugin/libacpi.c xfce4-battery-plugin-0.5.1/panel-plugin/libacpi.c --- xfce4-battery-plugin-0.5.1.orig/panel-plugin/libacpi.c 2011-01-01 11:09:48.000000000 +0100 +++ xfce4-battery-plugin-0.5.1/panel-plugin/libacpi.c 2011-01-01 11:10:33.000000000 +0100 @@ -55,6 +55,10 @@ static char batteries[MAXBATT][128]; static char battinfo[MAXBATT][128]; +/* path to AC adapter because not all AC adapter are listed +in /sys/class/power_supply/AC/ this obviously only supports one AC adapter. */ +static char sysfsacdir[128]; + #ifndef __linux__ #if HAVE_SYSCTL static int @@ -198,9 +202,76 @@ return fd; } +int check_acpi_sysfs(void) +{ + DIR *sysfs; + struct dirent *batt; + char *name; + FILE *typefile; + char typepath[128]; + char tmptype[8]; + + sysfs = opendir("/sys/class/power_supply"); + if (sysfs == 0) + { + #ifdef DEBUG + printf("DBG:No acpi support for sysfs. Trying procfs...\n"); + #endif + return 2; + } + + while ((batt = readdir(sysfs))) + { + name = batt->d_name; + if (!strncmp(".", name, 1)) continue; + /* check whether /sys/class/power_supply/$name/type exists and + contains "Battery" or "Mains" */ + sprintf(typepath, "/sys/class/power_supply/%s/type",name); + if(!(typefile = fopen(typepath, "r"))) continue; + fgets(tmptype, 8, typefile); + fclose(typefile); + if(strncmp("Battery", tmptype, 7)==0) + { + sprintf(batteries[batt_count], "/sys/class/power_supply/%s", name); + #ifdef DEBUG + printf("DBG:battery number %d at:\n",batt_count); + printf("DBG:sysfs dir->%s\n",batteries[batt_count]); + printf("DBG:------------------------\n"); + #endif + batt_count++; + } + /* I guess that the type of the AC adapter is always "Mains" (?) */ + else if(strncmp("Mains", tmptype, 5)==0){ + sprintf(sysfsacdir, "/sys/class/power_supply/%s", name); + #ifdef DEBUG + printf("DBG:sysfs AC dir->%s\n",sysfsacdir); + printf("DBG:------------------------\n"); + #endif + } + } + closedir(sysfs); + if ( batt_count == 0 ) + { +#ifdef DEBUG + printf("DBG:No acpi support for sysfs. Trying procfs...\n"); +#endif + acpi_sysfs = 0; + return 2; + } + else + { + acpi_sysfs = 1; + return 0; + } +} + /* see if we have ACPI support */ int check_acpi(void) { +#ifdef __linux__ + if ( check_acpi_sysfs() == 0 ) + return 0; +#endif DIR *battdir; struct dirent *batt; char *name; @@ -281,9 +352,82 @@ #endif } +int read_sysfs_int(char* filename) +{ + FILE* f; + f = fopen(filename,"r"); + if ( !f ) + { +#ifdef DEBUG + printf("DBG:Could not open %s\n",filename); +#endif + return 0; + } + int out; + fscanf(f,"%d",&out); + fclose(f); + return out; +} + +char* read_sysfs_string(char* filename) +{ + FILE* f; + f = fopen(filename,"r"); + if ( !f ) + { +#ifdef DEBUG + printf("DBG:Could not open %s\n",filename); +#endif + return NULL; + } + fscanf(f,"%s",buf2); + fclose(f); + return buf2; +} + +int read_acad_state_sysfs(void) +{ + DIR *sysfs; + struct dirent *propety; + char *name; + char onlinefilepath[128]; + + sysfs = opendir(sysfsacdir); + if (sysfs == 0) + { + #ifdef DEBUG + printf("DBG:Can't open %s",sysfsacdir); + #endif + return 0; + } + closedir(sysfs); + + if (!acadstate) acadstate=(ACADstate *)malloc(sizeof(ACADstate)); + /* this code doesn't make much sense.. why look at the whole directory?! + while ((propety = readdir(sysfs))) + { + name = propety->d_name; + if (!strncmp(".", name, 1) || !strncmp("..", name, 2)) continue; + + if (strcmp(name,"online") == 0) + { + acadstate->state = ( read_sysfs_int("/sys/class/power_supply/AC/online") == 1 ) ; + } + } + */ + sprintf(onlinefilepath, "%s/online", sysfsacdir); + /* if onlinefilepath doesn't exist read_sysfs_int() will return 0 + so acadstate->state will be 0, that should be ok */ + acadstate->state = ( read_sysfs_int(onlinefilepath) == 1 ); + + return acadstate->state; +} + int read_acad_state(void) { #ifdef __linux__ + if (acpi_sysfs) + return read_acad_state_sysfs(); FILE *acpi; char *ptr; char stat; @@ -373,20 +517,83 @@ #endif } +int read_acpi_info_sysfs(int battery) +{ + DIR *sysfs; + struct dirent *propety; + char *name; + + sysfs = opendir(batteries[battery]); + if (sysfs == 0) + { + #ifdef DEBUG + printf("DBG:Can't open %s!\n", batteries[battery]); + #endif + return 0; + } + /* malloc.. might explain the random battery level values on 2.6.24 + systems (energe_full is called charge_full so the value isn't initialised + and some random data from the heap is displayed..) + if (!acpiinfo) acpiinfo=(ACPIinfo *)malloc(sizeof(ACPIinfo)); + */ + if (!acpiinfo) acpiinfo=(ACPIinfo *)calloc(1, sizeof(ACPIinfo)); + + while ((propety = readdir(sysfs))) + { + name = propety->d_name; + if (!strncmp(".", name, 1) || !strncmp("..", name, 2)) continue; + /* at least on my system this is called charge_full */ + if ((strcmp(name,"energy_full") == 0) || (strcmp(name,"charge_full") == 0)) + { + sprintf(buf,"%s/%s",batteries[battery], name); + acpiinfo->last_full_capacity = read_sysfs_int(buf); + } + if ((strcmp(name,"energy_full_design") == 0) || (strcmp(name,"charge_full_design") == 0)) + { + sprintf(buf,"%s/%s",batteries[battery], name); + acpiinfo->design_capacity = read_sysfs_int(buf); + } + if (strcmp(name,"technology") == 0) + { + char *tmp; + sprintf(buf,"%s/%s",batteries[battery], name); + tmp = read_sysfs_string(buf); + if (tmp != NULL) + { + if (strcmp(tmp,"Li-ion") == 0) + acpiinfo->battery_technology = 1; + else + acpiinfo->battery_technology = 0; + } + } + if (strcmp(name,"present") == 0) + { + sprintf(buf,"%s/%s",batteries[battery], name); + acpiinfo->present = read_sysfs_int(buf); + } + } + closedir(sysfs); + return acpiinfo->present; +} + int read_acpi_info(int battery) { #ifdef __linux__ - FILE *acpi; - char *ptr; - char stat; - int temp; - if (battery > MAXBATT) { #ifdef DEBUG printf("DBG: error, battery > MAXBATT (%d)\n",MAXBATT); #endif return 0; } + + if (acpi_sysfs) + return read_acpi_info_sysfs(battery); + + FILE *acpi; + char *ptr; + char stat; + int temp; + if (!(acpi = fopen (battinfo[battery], "r"))) { #ifdef DEBUG printf("DBG:cannot open %s for read!\n",battinfo[battery]); @@ -533,9 +740,80 @@ } +int read_acpi_state_sysfs(int battery) +{ + DIR *sysfs; + struct dirent *propety; + char *name; + + sysfs = opendir(batteries[battery]); + if (sysfs == 0) + { + #ifdef DEBUG + printf("DBG:Can't open %s!\n", batteries[battery]); + #endif + return 0; + } + + /* again it might be better to use calloc + if (!acpistate) acpistate=(ACPIstate *)malloc(sizeof(ACPIstate)); + */ + if (!acpistate) acpistate=(ACPIstate *)calloc(1, sizeof(ACPIstate)); + + while ((propety = readdir(sysfs))) + { + name = propety->d_name; + if (!strncmp(".", name, 1) || !strncmp("..", name, 2)) continue; + + if (strcmp(name,"status") == 0) + { + char *tmp; + sprintf(buf,"%s/%s",batteries[battery], name); + tmp = read_sysfs_string(buf); + if ( tmp != NULL ) + { + if (strcmp(tmp,"Charging") == 0) + acpistate->state = CHARGING; + else if (strcmp(tmp,"Discharging") == 0) + acpistate->state = DISCHARGING; + else if (strcmp(tmp,"Full") == 0) + acpistate->state = POWER; + else + acpistate->state = UNKNOW; + } + } + /* on my system this is called charge_now */ + if ((strcmp(name,"energy_now") == 0) || (strcmp(name,"charge_now") == 0)) + { + sprintf(buf,"%s/%s",batteries[battery], name); + acpistate->rcapacity = read_sysfs_int(buf); + acpistate->percentage = (((float) acpistate->rcapacity)/acpiinfo->last_full_capacity) * 100; + } + if (strcmp(name,"current_now") == 0) + { + sprintf(buf,"%s/%s",batteries[battery], name); + acpistate->prate = read_sysfs_int(buf); + if ( acpistate->prate < 0 ) + acpistate->prate = 0; + if ( acpistate->prate > 0 ) + acpistate->rtime = (((float) acpistate->rcapacity) / acpistate->prate) * 60; + } + if (strcmp(name,"voltage_now") == 0) + { + sprintf(buf,"%s/%s",batteries[battery], name); + acpistate->pvoltage = read_sysfs_int(buf); + } + } + closedir(sysfs); + return acpiinfo->present; +} + int read_acpi_state(int battery) { #ifdef __linux__ + if (acpi_sysfs) + return read_acpi_state_sysfs(battery); + FILE *acpi; char *ptr; char stat; diff -ur xfce4-battery-plugin-0.5.1.orig/panel-plugin/libacpi.h xfce4-battery-plugin-0.5.1/panel-plugin/libacpi.h --- xfce4-battery-plugin-0.5.1.orig/panel-plugin/libacpi.h 2008-09-04 23:10:07.000000000 +0200 +++ xfce4-battery-plugin-0.5.1/panel-plugin/libacpi.h 2011-01-01 11:10:33.000000000 +0100 @@ -80,6 +80,8 @@ int batt_count; /* temp buffer */ char buf[512]; +char buf2[512]; +int acpi_sysfs; #else extern int batt_count; extern ACPIstate *acpistate; ++++++ xfce4-clipman-plugin-1.1.3-catch-null-value.patch ++++++ diff -ur xfce4-clipman-plugin-1.1.3.orig/daemon/gsd-clipboard-manager.c xfce4-clipman-plugin-1.1.3/daemon/gsd-clipboard-manager.c --- xfce4-clipman-plugin-1.1.3.orig/daemon/gsd-clipboard-manager.c 2009-11-15 21:24:52.000000000 +0100 +++ xfce4-clipman-plugin-1.1.3/daemon/gsd-clipboard-manager.c 2010-12-31 21:58:06.000000000 +0100 @@ -121,7 +121,7 @@ GtkSelectionData *selection_data_cache = NULL; list = manager->priv->default_cache; - for (; list->next != NULL; list = list->next) { + for (; list != NULL && list->next != NULL; list = list->next) { selection_data_cache = list->data; if (selection_data->target == selection_data_cache->target) { break; @@ -154,8 +154,11 @@ GtkSelectionData *sdata; GSList *list; - target_list = gtk_target_list_new (NULL, 0); list = manager->priv->default_cache; + if (list == NULL) { + return; + } + target_list = gtk_target_list_new (NULL, 0); for (; list->next != NULL; list = list->next) { sdata = list->data; gtk_target_list_add (target_list, sdata->target, 0, 0); ++++++ xfce4-clipman-plugin-1.1.3-fix-memory-leak.patch ++++++ diff -ur xfce4-clipman-plugin-1.1.3.orig/daemon/gsd-clipboard-manager.c xfce4-clipman-plugin-1.1.3/daemon/gsd-clipboard-manager.c --- xfce4-clipman-plugin-1.1.3.orig/daemon/gsd-clipboard-manager.c 2010-12-31 21:58:06.000000000 +0100 +++ xfce4-clipman-plugin-1.1.3/daemon/gsd-clipboard-manager.c 2010-12-31 22:04:17.000000000 +0100 @@ -164,6 +164,7 @@ gtk_target_list_add (target_list, sdata->target, 0, 0); } targets = gtk_target_table_new_from_list (target_list, &n_targets); + gtk_target_list_unref (target_list); gtk_clipboard_set_with_data (manager->priv->default_clipboard, targets, n_targets, ++++++ xfce4-fsguard-plugin-0.4.2.tar.bz2 -> xfce4-fsguard-plugin-1.0.0.tar.bz2 ++++++ ++++ 29529 lines of diff (skipped) ++++++ xfce4-genmon-plugin-3.2-close-unused-pipes.patch ++++++ diff -ur xfce4-genmon-plugin-3.2.orig/panel-plugin/cmdspawn.c xfce4-genmon-plugin-3.2/panel-plugin/cmdspawn.c --- xfce4-genmon-plugin-3.2.orig/panel-plugin/cmdspawn.c 2007-11-23 16:32:40.000000000 +0100 +++ xfce4-genmon-plugin-3.2/panel-plugin/cmdspawn.c 2011-01-01 11:27:04.000000000 +0100 @@ -184,6 +184,7 @@ return (-1); case 0: /* Redirect stdout/stderr to associated pipe's write-ends */ + close(0); /* stdin is not used in child */ for (i = 0; i < OUT_ERR; i++) { j = i + 1; // stdout/stderr file descriptor close (j); @@ -199,6 +200,9 @@ exit (-1); } + for (i = 0; i < OUT_ERR; i++) + close (aaiPipe[i][WR]); /* close write end of pipes in parent */ + /* Wait for child completion */ if (wait == 1) { @@ -231,10 +235,9 @@ } End: - /* Close created pipes */ + /* Close read end of pipes */ for (i = 0; i < OUT_ERR; i++) - for (j = 0; j < RD_WR; j++) - close (aaiPipe[i][j]); + close (aaiPipe[i][RD]); return (-fError); }// Spawn() ++++++ xfce4-genmon-plugin-3.2-prevent-zombies.patch ++++++ diff -ur xfce4-genmon-plugin-3.2.orig/panel-plugin/main.c xfce4-genmon-plugin-3.2/panel-plugin/main.c --- xfce4-genmon-plugin-3.2.orig/panel-plugin/main.c 2008-03-15 23:38:18.000000000 +0100 +++ xfce4-genmon-plugin-3.2/panel-plugin/main.c 2011-01-01 11:17:46.000000000 +0100 @@ -32,6 +32,7 @@ #include <libxfce4util/libxfce4util.h> #include <libxfcegui4/dialogs.h> +#include <libxfcegui4/xfce-exec.h> #include <libxfce4panel/xfce-panel-plugin.h> #include <libxfce4panel/xfce-panel-convenience.h> @@ -94,10 +95,18 @@ { struct genmon_t *poPlugin = (genmon_t *) p_pvPlugin; struct monitor_t *poMonitor = &(poPlugin->oMonitor); - char result[256]; + GError *error = NULL; + + xfce_exec(poMonitor->onClickCmd, 0, 0, &error); + if (error) { + char first[256]; + g_snprintf (first, sizeof(first), _("Could not run \"%s\""), poMonitor->onClickCmd); + xfce_message_dialog (NULL, _("Xfce Panel"), + GTK_STOCK_DIALOG_ERROR, first, error->message, + GTK_STOCK_CLOSE, GTK_RESPONSE_OK, NULL); + g_error_free (error); + } - genmon_SpawnCmd (poMonitor->onClickCmd, result, - sizeof (poMonitor->onClickCmd), 0); } /**************************************************************/ ++++++ xfce4-netload-plugin-0.4.0.tar.bz2 -> xfce4-netload-plugin-1.0.0.tar.bz2 ++++++ ++++ 33080 lines of diff (skipped) ++++++ xfce4-notes-plugin-1.7.7-fix-desktop-file.patch ++++++ diff -ur xfce4-notes-plugin-1.7.7.orig/src/xfce4-notes-plugin-47.desktop.in xfce4-notes-plugin-1.7.7/src/xfce4-notes-plugin-47.desktop.in --- xfce4-notes-plugin-1.7.7.orig/src/xfce4-notes-plugin-47.desktop.in 2010-11-07 12:25:41.000000000 +0100 +++ xfce4-notes-plugin-1.7.7/src/xfce4-notes-plugin-47.desktop.in 2011-01-01 13:42:43.000000000 +0100 @@ -6,4 +6,5 @@ Icon=xfce4-notes-plugin X-XFCE-Unique=true X-XFCE-Module=notes +X-XFCE-Module-Path=@INTERNAL_PLUGIN_PATH@ X-XFCE-Internal=FALSE ++++++ xfce4-panel-plugins-rpmlintrc ++++++ addFilter("untranslated-desktop-file .*/usr/share/xfce4/panel-plugins/.*") addFilter("devel-file-in-non-devel-package .*/usr/lib[:digit:]*/xfce4/panel-plugins/.*") ++++++ xfce4-quicklauncher-plugin-1.9.4-add-missing-en-translation.patch ++++++ diff -urN xfce4-quicklauncher-plugin-1.9.4.orig/configure xfce4-quicklauncher-plugin-1.9.4/configure --- xfce4-quicklauncher-plugin-1.9.4.orig/configure 2007-06-27 21:07:14.000000000 +0200 +++ xfce4-quicklauncher-plugin-1.9.4/configure 2011-01-01 11:53:38.000000000 +0100 @@ -21181,7 +21181,7 @@ - ALL_LINGUAS="cs el eu fr gl hu ja pl ru vi" + ALL_LINGUAS="cs el en eu fr gl hu ja pl ru vi" for ac_header in locale.h diff -urN xfce4-quicklauncher-plugin-1.9.4.orig/po/en.po xfce4-quicklauncher-plugin-1.9.4/po/en.po --- xfce4-quicklauncher-plugin-1.9.4.orig/po/en.po 1970-01-01 01:00:00.000000000 +0100 +++ xfce4-quicklauncher-plugin-1.9.4/po/en.po 2011-01-01 11:53:38.000000000 +0100 @@ -0,0 +1,87 @@ +# English translation of xfce4-quicklauncher-plugin. +# Copyright (C) 2007 THE xfce4-quicklauncher-plugin'S COPYRIGHT HOLDER +# This file is distributed under the same license as the xfce4-quicklauncher-plugin package. +# Jeff Bailes <thepizzaking@gmail.com>, 2007. +# , fuzzy +# +# +msgid "" +msgstr "" +"Project-Id-Version: xfce4-quicklauncher-plugin\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-05-17 21:37+0200\n" +"PO-Revision-Date: 2007-03-31 10:17+1000\n" +"Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n" +"Language-Team: English\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit" + +#: ../panel-plugin/callbacks.c:79 +msgid "Configure Quicklauncher" +msgstr "Configure Quicklauncher" + +#: ../panel-plugin/callbacks.c:93 +msgid "Lines: " +msgstr "Lines: " + +#: ../panel-plugin/callbacks.c:123 +msgid "Espace entre les lanceurs :" +msgstr "Space between launchers" + +#: ../panel-plugin/callbacks.c:131 +msgid "afficher les tooltips" +msgstr "Show tooltips" + +#: ../panel-plugin/callbacks.c:135 +msgid "afficher les labels" +msgstr "Show labels" + +#: ../panel-plugin/callbacks.c:216 +msgid "icone" +msgstr "icon" + +#: ../panel-plugin/callbacks.c:222 +msgid "commande" +msgstr "command" + +#: ../panel-plugin/callbacks.c:228 +msgid "nom" +msgstr "name" + +#: ../panel-plugin/callbacks.c:327 +msgid "Open icon" +msgstr "Open icon" + +#: ../panel-plugin/main.c:163 ../panel-plugin/quicklauncher.desktop.in.in.h:2 +msgid "Quicklauncher" +msgstr "Quicklauncher" + +#: ../panel-plugin/main.c:166 +msgid "Allows you to add launchers easily and display them on many lines." +msgstr "Allows you to add launchers easily and display them on many lines." + +#: ../panel-plugin/main.c:168 +msgid "Other plugins available here" +msgstr "Other plugins available here" + +#: ../panel-plugin/main.c:320 +msgid "Lock" +msgstr "Lock" + +#: ../panel-plugin/main.c:323 +msgid "Parameters" +msgstr "Parameters" + +#: ../panel-plugin/main.c:326 +msgid "Applications" +msgstr "Applications" + +#: ../panel-plugin/main.c:329 +msgid "Help" +msgstr "Help" + +#: ../panel-plugin/quicklauncher.desktop.in.in.h:1 +msgid "Program with several launchers" +msgstr "Program with several launchers" + ++++++ xfce4-quicklauncher-plugin-1.9.4-fix-desktop-file.patch ++++++ diff -ur xfce4-quicklauncher-plugin-1.9.4.orig/panel-plugin/quicklauncher.desktop.in.in xfce4-quicklauncher-plugin-1.9.4/panel-plugin/quicklauncher.desktop.in.in --- xfce4-quicklauncher-plugin-1.9.4.orig/panel-plugin/quicklauncher.desktop.in.in 2005-09-25 21:08:43.000000000 +0200 +++ xfce4-quicklauncher-plugin-1.9.4/panel-plugin/quicklauncher.desktop.in.in 2011-01-01 13:43:26.000000000 +0100 @@ -4,4 +4,5 @@ _Name=Quicklauncher _Comment=Program with several launchers Icon=gnome-fs-executable -X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/libquicklauncher.so +X-XFCE-Module=libquicklauncher.so +X-XFCE-Module-Path=@INTERNAL_PLUGIN_PATH@ ++++++ xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch ++++++ diff -ur xfce4-quicklauncher-plugin-1.9.4.orig/panel-plugin/main.c xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c --- xfce4-quicklauncher-plugin-1.9.4.orig/panel-plugin/main.c 2011-01-01 11:44:18.000000000 +0100 +++ xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c 2011-01-01 11:47:16.000000000 +0100 @@ -148,6 +148,7 @@ t_qck_launcher_opt_dlg* dlg; xfce_panel_plugin_block_menu(plugin); dlg = create_qck_launcher_dlg(); + gtk_window_set_screen (GTK_WINDOW (dlg->dialog), gtk_widget_get_screen (plugin)); qck_launcher_opt_dlg_set_quicklauncher(quicklauncher); gtk_dialog_run(GTK_DIALOG(dlg->dialog)); quicklauncher_save(plugin, quicklauncher); @@ -161,6 +162,7 @@ GtkWidget *about; const gchar* authors[2] = {"Bountykiller <masse_nicolas@yahoo.fr>", NULL}; about = gtk_about_dialog_new(); + gtk_window_set_screen (GTK_WINDOW (about), gtk_widget_get_screen (plugin)); gtk_about_dialog_set_name(GTK_ABOUT_DIALOG(about), _("Quicklauncher")); gtk_about_dialog_set_logo(GTK_ABOUT_DIALOG(about), NULL); gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(about), (const gchar**) authors); @@ -462,7 +464,7 @@ if(launcher->quicklauncher->_last_zoomed_launcher == launcher) { g_return_val_if_fail(launcher->clicked_img, FALSE); - xfce_exec(launcher->command, FALSE, FALSE, NULL); + xfce_exec_on_screen(gtk_widget_get_screen (box), launcher->command, FALSE, FALSE, NULL); gtk_image_set_from_pixbuf (GTK_IMAGE(launcher->image), launcher->def_img); } else ++++++ xfce4-quicklauncher-plugin-1.9.4-fix-parameters-launcher.patch ++++++ diff -ur xfce4-quicklauncher-plugin-1.9.4.orig/panel-plugin/main.c xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c --- xfce4-quicklauncher-plugin-1.9.4.orig/panel-plugin/main.c 2011-01-01 11:40:59.000000000 +0100 +++ xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c 2011-01-01 11:44:18.000000000 +0100 @@ -321,7 +321,7 @@ launcher = launcher_new(_("Lock"), "xflock4", XFCE_ICON_CATEGORY_SYSTEM, NULL, quicklauncher); quicklauncher_add_element(quicklauncher, launcher); - launcher = launcher_new(_("Parameters"),"xfce-setting-show", XFCE_ICON_CATEGORY_SETTINGS, + launcher = launcher_new(_("Parameters"),"xfce4-settings-manager", XFCE_ICON_CATEGORY_SETTINGS, NULL, quicklauncher); quicklauncher_add_element(quicklauncher, launcher); launcher = launcher_new(_("Applications"), "xfce4-appfinder", XFCE_ICON_CATEGORY_UTILITY, ++++++ xfce4-quicklauncher-plugin-1.9.4-save-settings.patch ++++++ diff -ur xfce4-quicklauncher-plugin-1.9.4.orig/panel-plugin/main.c xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c --- xfce4-quicklauncher-plugin-1.9.4.orig/panel-plugin/main.c 2007-05-14 22:42:09.000000000 +0200 +++ xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c 2011-01-01 11:40:59.000000000 +0100 @@ -150,6 +150,7 @@ dlg = create_qck_launcher_dlg(); qck_launcher_opt_dlg_set_quicklauncher(quicklauncher); gtk_dialog_run(GTK_DIALOG(dlg->dialog)); + quicklauncher_save(plugin, quicklauncher); xfce_panel_plugin_unblock_menu(plugin); } ++++++ xfce4-sensors-plugin-0.10.99.6-fix-build-with-4.7.patch -> xfce4-sensors-plugin-1.0.0-fix-build-with-4.7.patch ++++++ --- xfce4-panel-plugins/xfce4-sensors-plugin-0.10.99.6-fix-build-with-4.7.patch 2010-12-05 20:11:28.000000000 +0100 +++ /mounts/work_src_done/STABLE/xfce4-panel-plugins/xfce4-sensors-plugin-1.0.0-fix-build-with-4.7.patch 2011-01-01 12:50:44.000000000 +0100 @@ -1,6 +1,18 @@ -diff -ur xfce4-sensors-plugin-0.10.99.6.orig/panel-plugin/Makefile.am xfce4-sensors-plugin-0.10.99.6/panel-plugin/Makefile.am ---- xfce4-sensors-plugin-0.10.99.6.orig/panel-plugin/Makefile.am 2008-11-03 22:09:06.000000000 +0100 -+++ xfce4-sensors-plugin-0.10.99.6/panel-plugin/Makefile.am 2010-12-05 14:05:44.000000000 +0100 +diff -ur xfce4-sensors-plugin-1.0.0.orig/include/sensors-interface-common.h xfce4-sensors-plugin-1.0.0/include/sensors-interface-common.h +--- xfce4-sensors-plugin-1.0.0.orig/include/sensors-interface-common.h 2010-03-28 20:11:33.000000000 +0200 ++++ xfce4-sensors-plugin-1.0.0/include/sensors-interface-common.h 2011-01-01 01:46:24.000000000 +0100 +@@ -31,7 +31,7 @@ + /* #include <glib/gprintf.h> */ + + /* Xfce includes */ +-#include <libxfce4panel/xfce-panel-plugin.h> ++#include <libxfce4panel/libxfce4panel.h> + + /* Package includes */ + #include <types.h> +diff -ur xfce4-sensors-plugin-1.0.0.orig/panel-plugin/Makefile.am xfce4-sensors-plugin-1.0.0/panel-plugin/Makefile.am +--- xfce4-sensors-plugin-1.0.0.orig/panel-plugin/Makefile.am 2009-11-06 12:02:11.000000000 +0100 ++++ xfce4-sensors-plugin-1.0.0/panel-plugin/Makefile.am 2011-01-01 01:48:53.000000000 +0100 @@ -20,6 +20,7 @@ xfce4_sensors_plugin_CFLAGS = \ @@ -9,22 +21,28 @@ @PLATFORM_CFLAGS@ \ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ @LIBSENSORS_CFLAGS@ -@@ -30,6 +31,7 @@ - xfce4_sensors_plugin_LDFLAGS = \ +@@ -27,9 +28,10 @@ + # @GTK_CFLAGS@ \ + # @GLIB_CFLAGS@ + +-xfce4_sensors_plugin_LDFLAGS = \ ++xfce4_sensors_plugin_LDADD = \ $(top_builddir)/lib/libxfce4sensors.la @LIBXFCE4PANEL_LIBS@ \ -+ @LIBXFCEGUI4_LIBS@ \ ++ @LIBXFCEGUI4_LIBS@ \ @SOLLIBS@ \ @LIBSENSORS_LDFLAGS@ -diff -ur xfce4-sensors-plugin-0.10.99.6.orig/src/Makefile.am xfce4-sensors-plugin-0.10.99.6/src/Makefile.am ---- xfce4-sensors-plugin-0.10.99.6.orig/src/Makefile.am 2008-11-03 22:09:06.000000000 +0100 -+++ xfce4-sensors-plugin-0.10.99.6/src/Makefile.am 2010-12-05 14:18:33.000000000 +0100 -@@ -28,6 +28,7 @@ - -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ - @LIBSENSORS_CFLAGS@ \ +diff -ur xfce4-sensors-plugin-1.0.0.orig/src/Makefile.am xfce4-sensors-plugin-1.0.0/src/Makefile.am +--- xfce4-sensors-plugin-1.0.0.orig/src/Makefile.am 2009-11-06 12:02:11.000000000 +0100 ++++ xfce4-sensors-plugin-1.0.0/src/Makefile.am 2011-01-01 10:39:52.000000000 +0100 +@@ -27,7 +27,8 @@ + -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ + @LIBSENSORS_CFLAGS@ \ @LIBXFCE4UTIL_CFLAGS@ \ -+ @LIBXFCE4PANEL_CFLAGS@ \ - @LIBXFCEGUI4_CFLAGS@ +- @LIBXFCEGUI4_CFLAGS@ ++ @LIBXFCEGUI4_CFLAGS@ \ ++ @LIBXFCE4PANEL_CFLAGS@ - # @GTK_CFLAGS@ \ + # @GTK_CFLAGS@ \ + # @GLIB_CFLAGS@ \ ++++++ xfce4-sensors-plugin-1.0.0-fix-memory-leaks.patch ++++++ diff -ur xfce4-sensors-plugin-1.0.0.orig/lib/acpi.c xfce4-sensors-plugin-1.0.0/lib/acpi.c --- xfce4-sensors-plugin-1.0.0.orig/lib/acpi.c 2010-03-27 16:11:48.000000000 +0100 +++ xfce4-sensors-plugin-1.0.0/lib/acpi.c 2011-01-01 01:23:15.000000000 +0100 @@ -631,6 +631,7 @@ TRACE ("leaves get_acpi_info"); version = get_acpi_value (filename); + g_free (filename); if (version!=NULL) version = g_strchomp (version); @@ -654,6 +655,7 @@ filename = g_strdup_printf ("%s/%s/%s", ACPI_PATH, zone, file); value = get_acpi_value (filename); + g_free(filename); TRACE ("leaves get_acpi_zone_value with correctly converted value"); ++++++ xfce4-sensors-plugin-1.0.0-fix-uninitialized-memory.patch ++++++ diff -ur xfce4-sensors-plugin-1.0.0.orig/lib/sensors-interface-common.c xfce4-sensors-plugin-1.0.0/lib/sensors-interface-common.c --- xfce4-sensors-plugin-1.0.0.orig/lib/sensors-interface-common.c 2010-03-27 16:11:48.000000000 +0100 +++ xfce4-sensors-plugin-1.0.0/lib/sensors-interface-common.c 2011-01-07 12:27:27.000000000 +0100 @@ -43,7 +43,7 @@ TRACE ("enters sensors_new"); - sensors = g_new (t_sensors, 1); + sensors = g_new0 (t_sensors, 1); sensors->plugin_config_file = plugin_config_file; /* important as we check against NULL frequently */ /* init xfce sensors stuff width default values */ @@ -69,6 +69,7 @@ chipfeature->address = 0; chip->sensorId = g_strdup(_("No sensors found!")); + chip->description = g_strdup(_("No sensors found!")); chip->num_features = 1; chipfeature->color = g_strdup("#000000"); /* g_free (chipfeature->name); */ ++++++ xfce4-sensors-plugin-0.10.99.6.tar.bz2 -> xfce4-sensors-plugin-1.0.0.tar.bz2 ++++++ ++++ 98263 lines of diff (skipped) ++++++ xfce4-smartbookmark-plugin-0.4.2-fix-desktop-file.patch ++++++ diff -ur xfce4-smartbookmark-plugin-0.4.2.orig/src/smartbookmark.desktop.in.in xfce4-smartbookmark-plugin-0.4.2/src/smartbookmark.desktop.in.in --- xfce4-smartbookmark-plugin-0.4.2.orig/src/smartbookmark.desktop.in.in 2006-08-12 19:41:44.000000000 +0200 +++ xfce4-smartbookmark-plugin-0.4.2/src/smartbookmark.desktop.in.in 2011-01-01 13:43:54.000000000 +0100 @@ -4,5 +4,6 @@ _Name=SmartBookmark _Comment=Query websites from the Xfce panel Icon=gtk-preferences -X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/libsmartbookmark.so +X-XFCE-Module=libsmartbookmark.so +X-XFCE-Module-Path=@INTERNAL_PLUGIN_PATH@ X-XFCE-Unique=false ++++++ xfce4-systemload-plugin-0.4.2.tar.bz2 -> xfce4-systemload-plugin-1.0.0.tar.bz2 ++++++ ++++ 56061 lines of diff (skipped) ++++++ xfce4-time-out-plugin-0.1.1.tar.bz2 -> xfce4-time-out-plugin-1.0.0.tar.bz2 ++++++ ++++ 63293 lines of diff (skipped) ++++++ xfce4-verve-plugin-0.3.6.tar.bz2 -> xfce4-verve-plugin-1.0.0.tar.bz2 ++++++ ++++ 73395 lines of diff (skipped) ++++++ xfce4-xkb-plugin-0.5.3.3-check-retval.patch ++++++ diff -ur xfce4-xkb-plugin-0.5.3.3.orig/panel-plugin/xkb-settings-dialog.c xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-settings-dialog.c --- xfce4-xkb-plugin-0.5.3.3.orig/panel-plugin/xkb-settings-dialog.c 2009-03-06 14:16:03.000000000 +0100 +++ xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-settings-dialog.c 2011-01-01 01:15:41.000000000 +0100 @@ -831,9 +831,11 @@ gint i = 0; model = GTK_TREE_MODEL (xkb->combo_store); - gtk_combo_box_get_active_iter (GTK_COMBO_BOX (xkb->kbd_model_combo), &iter); - gtk_tree_model_get (model, &iter, NOM, &kbdmodel, -1); - kbd_config->model = kbdmodel; + if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (xkb->kbd_model_combo), &iter)) + { + gtk_tree_model_get (model, &iter, NOM, &kbdmodel, -1); + kbd_config->model = kbdmodel; + } model = GTK_TREE_MODEL (xkb->toggle_options_store); if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (xkb->toggle_options_combo), &iter)) ++++++ xfce4-xkb-plugin-0.5.3.3-do-not-free-stack-memory.patch ++++++ diff -ur xfce4-xkb-plugin-0.5.3.3.orig/panel-plugin/xkb-config.c xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c --- xfce4-xkb-plugin-0.5.3.3.orig/panel-plugin/xkb-config.c 2011-01-01 01:14:16.000000000 +0100 +++ xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c 2011-01-01 01:18:16.000000000 +0100 @@ -290,7 +290,7 @@ if (settings->kbd_config->toggle_option && strlen (settings->kbd_config->toggle_option) > 0) options = g_strdup (settings->kbd_config->toggle_option); - else options = ""; + else options = g_strdup (""); if (settings->kbd_config->compose_key_position && strlen (settings->kbd_config->compose_key_position) > 0) @@ -312,11 +312,11 @@ { prefix = g_strsplit(*opt, ":", 2); if (settings->kbd_config->toggle_option == NULL - && prefix && strcmp(*prefix, "grp") == 0) + && prefix && *prefix && strcmp(*prefix, "grp") == 0) { settings->kbd_config->toggle_option = g_strdup (*opt); } - else if (prefix && strcmp(*prefix, "compose") == 0) + else if (prefix && *prefix && strcmp(*prefix, "compose") == 0) { settings->kbd_config->compose_key_position = g_strdup (*opt); } ++++++ xfce4-xkb-plugin-0.5.3.3-fix-array-size.patch ++++++ diff -ur xfce4-xkb-plugin-0.5.3.3.orig/panel-plugin/xkb-settings-dialog.c xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-settings-dialog.c --- xfce4-xkb-plugin-0.5.3.3.orig/panel-plugin/xkb-settings-dialog.c 2011-01-01 01:15:41.000000000 +0100 +++ xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-settings-dialog.c 2011-01-01 01:19:07.000000000 +0100 @@ -678,7 +678,7 @@ xfce_xkb_about (XfcePanelPlugin *plugin) { GtkWidget *about; - const gchar* authors[2] = { + const gchar* authors[3] = { "Alexander Iliev <sasoiliev@mamul.org>", "Gauvain Pocentek <gauvainpocentek@gmail.com>", NULL ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org