applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove -control from the end of the string as well as -capplet

Browse source 
2001-09-28  Bradford Hovinen  <hovinen@ximian.com>

	* capplet-util.c (get_default_moniker): Remove -control from the
	end of the string as well as -capplet
	(get_factory_name): Ditto
	(get_property_name): Ditto

	* capplets/*/Makefile.am: Change the binary name to
	*-properties-control and create a wrapper script from
	../common/wrapper-script.in to be named
	*-properties-capplet
	Remove support for disabling bonobo-conf build
This commit is contained in:
Bradford Hovinen 2001-09-28 12:30:35 +00:00 • committed by Bradford Hovinen (Gdict maintainer)
parent b286046683
commit a850f20fa7
12 changed files with 83 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

3
capplets/common/capplet-util.c
View file

@ -322,6 +322,7 @@ get_factory_name (const gchar *binary)
tmp = strrchr (s, '/');
if (tmp == NULL) tmp = s;
else tmp++;
if ((tmp1 = strstr (tmp, "-control")) != NULL) *tmp1 = '\0';
if ((tmp1 = strstr (tmp, "-capplet")) != NULL) *tmp1 = '\0';
while ((tmp1 = strchr (tmp, '-')) != NULL) *tmp1 = '_';
@ -344,6 +345,7 @@ get_default_moniker (const gchar *binary)
tmp = strrchr (s, '/');
if (tmp == NULL) tmp = s;
else tmp++;
if ((tmp1 = strstr (tmp, "-control")) != NULL) *tmp1 = '\0';
if ((tmp1 = strstr (tmp, "-capplet")) != NULL) *tmp1 = '\0';
res = g_strconcat ("archive:user-archive#archiverdb:", tmp, NULL);
@ -365,6 +367,7 @@ get_property_name (const gchar *binary)
tmp = strrchr (s, '/');
if (tmp == NULL) tmp = s;
else tmp++;
if ((tmp1 = strstr (tmp, "-control")) != NULL) *tmp1 = '\0';
if ((tmp1 = strstr (tmp, "-capplet")) != NULL) *tmp1 = '\0';
for (tmp1 = tmp; *tmp1 != '\0'; tmp1++) {