drop unused patches
This commit is contained in:
		
							parent
							
								
									59b3833e57
								
							
						
					
					
						commit
						f5ab32d0b3
					
				| @ -1,11 +0,0 @@ | ||||
| --- desktop-file-utils-0.10/src/update-desktop-database.c.dont-use-uninitialized-memory	2006-01-22 15:53:08.000000000 -0500
 | ||||
| +++ desktop-file-utils-0.10/src/update-desktop-database.c	2006-01-22 15:53:17.000000000 -0500
 | ||||
| @@ -444,7 +444,7 @@
 | ||||
|   | ||||
|    for (i = 0; data_dirs[i] != NULL; i++); | ||||
|   | ||||
| -  args = g_new (char *, i + 1);
 | ||||
| +  args = g_new0 (char *, i + 1);
 | ||||
|   | ||||
|    for (i = 0; data_dirs[i] != NULL; i++) | ||||
|      args[i] = g_build_filename (data_dirs[i], "applications", NULL); | ||||
| @ -1,20 +0,0 @@ | ||||
| --- desktop-file-utils-0.11/src/validate.c.make-category-validation-non-fatal	2006-04-18 18:03:13.000000000 -0400
 | ||||
| +++ desktop-file-utils-0.11/src/validate.c	2006-10-27 14:33:53.000000000 -0400
 | ||||
| @@ -208,7 +208,7 @@
 | ||||
|  	    { | ||||
|  	      if (strcmp (vals[i], categories_keys[j]) != 0) | ||||
|  		{ | ||||
| -		  print_fatal (filename, "%s values are case sensitive (should be \"%s\" instead of \"%s\")\n",
 | ||||
| +		  print_warning (filename, "%s values are case sensitive (should be \"%s\" instead of \"%s\")\n",
 | ||||
|  			       key, categories_keys[j], vals[i]); | ||||
|  		} | ||||
|  	      break; | ||||
| @@ -221,7 +221,7 @@
 | ||||
|  	  char *valid_categories; | ||||
|   | ||||
|  	  valid_categories = g_strjoinv ("\", \"", (gchar **) categories_keys); | ||||
| -	  print_fatal (filename, "%s values must be one of \"%s\" (found \"%s\")\n",
 | ||||
| +	  print_warning (filename, "%s values must be one of \"%s\" (found \"%s\")\n",
 | ||||
|  		       key, valid_categories, vals[i]); | ||||
|  	  g_free (valid_categories); | ||||
|  	} | ||||
| @ -1,31 +0,0 @@ | ||||
| --- desktop-file-utils-0.12/src/install.c   18 Apr 2006 22:08:10 -0000      1.18
 | ||||
| +++ desktop-file-utils-0.12/src/install.c   2 Feb 2007 19:43:27 -0000
 | ||||
| @@ -96,12 +96,10 @@ process_one_file (const char *filename,
 | ||||
|    GError *rebuild_error; | ||||
|    GSList *tmp; | ||||
|     | ||||
| -  g_assert (vendor_name);
 | ||||
| -
 | ||||
|    dirname = g_path_get_dirname (filename); | ||||
|    basename = g_path_get_basename (filename); | ||||
|     | ||||
| -  if (!g_str_has_prefix (basename, vendor_name))
 | ||||
| +  if (vendor_name && !g_str_has_prefix (basename, vendor_name))
 | ||||
|      { | ||||
|        char *new_base; | ||||
|        new_base = g_strconcat (vendor_name, "-", basename, NULL); | ||||
| @@ -564,12 +562,6 @@ main (int argc, char **argv)
 | ||||
|    if (vendor_name == NULL) | ||||
|      vendor_name = g_strdup (g_getenv ("DESKTOP_FILE_VENDOR")); | ||||
|     | ||||
| -  if (vendor_name == NULL)
 | ||||
| -    {
 | ||||
| -      g_printerr (_("Must specify the vendor namespace for these files with --vendor\n"));
 | ||||
| -      return 1;
 | ||||
| -    }
 | ||||
| -
 | ||||
|    if (copy_generic_name_to_name && copy_name_to_generic_name) | ||||
|      { | ||||
|        g_printerr (_("Specifying both --copy-name-to-generic-name and --copy-generic-name-to-name at once doesn't make much sense.\n")); | ||||
| 
 | ||||
| 
 | ||||
| @ -1,18 +0,0 @@ | ||||
| --- desktop-file-utils-0.9/src/eggdesktopentries.c.nogroup	2004-10-18 14:10:48.527841168 +0200
 | ||||
| +++ desktop-file-utils-0.9/src/eggdesktopentries.c	2004-10-18 14:19:33.102093760 +0200
 | ||||
| @@ -884,6 +884,15 @@
 | ||||
|    gchar *key, *value, *key_end, *value_start, *locale; | ||||
|    gsize key_len, value_len; | ||||
|   | ||||
| +  if (entries->current_group->name == NULL)
 | ||||
| +    {
 | ||||
| +      g_set_error (error, EGG_DESKTOP_ENTRIES_ERROR,
 | ||||
| +		   EGG_DESKTOP_ENTRIES_ERROR_BAD_START_GROUP,
 | ||||
| +		   _("desktop entry file does not start with "
 | ||||
| +		     "legal start group"));
 | ||||
| +      return;
 | ||||
| +    }
 | ||||
| +
 | ||||
|    key_end = value_start = strchr (line, '='); | ||||
|   | ||||
|    g_assert (key_end != NULL); | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user