Commit 73ffa70a authored by Vincent Untz's avatar Vincent Untz
Browse files

[all] Various cleanups/tiny fixes

Those are all small changes I want to do before the merge.
parent bd8305fd
......@@ -168,11 +168,11 @@ endif
uidir = $(datadir)/gnome-panel/ui
ui_DATA = clock.ui
xmluidir = $(datadir)/gnome-2.0/ui
xmlui_DATA = GNOME_ClockApplet.xml
xmluidir = $(datadir)/gnome-panel/ui
xmlui_DATA = clock-menu.xml
appletdir = $(datadir)/gnome-panel/applets
applet_in_files = GNOME_ClockApplet.panel-applet.in
applet_in_files = org.gnome.panel.ClockApplet.panel-applet.in
applet_DATA = $(applet_in_files:.panel-applet.in=.panel-applet)
$(applet_in_files): $(applet_in_files).in Makefile
......@@ -250,7 +250,7 @@ test_system_timezone_LDADD = \
$(NULL)
EXTRA_DIST = \
GNOME_ClockApplet.panel-applet.in.in \
org.gnome.panel.ClockApplet.panel-applet.in.in \
$(schemas_in_files) \
$(xmlui_DATA) \
$(ui_DATA) \
......
......@@ -2638,7 +2638,7 @@ fill_clock_applet (PanelApplet *applet)
clock_menu_actions,
G_N_ELEMENTS (clock_menu_actions),
cd);
ui_path = g_build_filename (CLOCK_MENU_UI_DIR, "GNOME_ClockApplet.xml", NULL);
ui_path = g_build_filename (CLOCK_MENU_UI_DIR, "clock-menu.xml", NULL);
panel_applet_setup_menu_from_file (PANEL_APPLET (cd->applet),
ui_path, action_group);
g_free (ui_path);
......
......@@ -3,13 +3,13 @@ Id=ClockAppletFactory
InProcess=@IN_PROCESS@
Location=@LOCATION@
_Name=Clock Applet Factory
_Description=Factory for creating clock applets.
_Description=Factory for clock applet
[ClockApplet]
_Name=Clock
_Description=Get the current time and date
Icon=gnome-panel-clock
BonoboId=OAFIID:GNOME_ClockApplet
BonoboId=OAFIID:GNOME_ClockApplet;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gnome-panel
X-GNOME-Bugzilla-Component=clock
......
......@@ -45,13 +45,13 @@ FISH_BITMAPS = \
footguy.png \
monkey.png
EXTRA_DIST = \
wanda.svg \
$(FISH_BITMAPS) \
GNOME_FishApplet.panel-applet.in.in \
$(service_in_files) \
fish.schemas.in \
$(ui_DATA) \
EXTRA_DIST = \
wanda.svg \
$(FISH_BITMAPS) \
org.gnome.panel.FishApplet.panel-applet.in.in \
$(service_in_files) \
fish.schemas.in \
$(ui_DATA) \
$(xmlui_DATA)
uidir = $(datadir)/gnome-panel/ui
......@@ -60,13 +60,13 @@ ui_DATA = fish.ui
fishbitmapsdir = $(datadir)/gnome-panel/pixmaps
fishbitmaps_DATA = $(FISH_BITMAPS)
xmluidir = $(datadir)/gnome-2.0/ui
xmlui_DATA = GNOME_FishApplet.xml
xmluidir = $(datadir)/gnome-panel/ui
xmlui_DATA = fish-menu.xml
CLEANFILES = $(schemas_DATA) $(applet_DATA) $(applet_DATA).in $(service_DATA)
appletdir = $(datadir)/gnome-panel/applets
applet_in_files = GNOME_FishApplet.panel-applet.in
applet_in_files = org.gnome.panel.FishApplet.panel-applet.in
applet_DATA = $(applet_in_files:.panel-applet.in=.panel-applet)
$(applet_in_files): $(applet_in_files).in Makefile
......
......@@ -1905,7 +1905,7 @@ fish_applet_fill (FishApplet *fish)
fish_menu_verbs,
G_N_ELEMENTS (fish_menu_verbs),
fish);
ui_path = g_build_filename (FISH_MENU_UI_DIR, "GNOME_FishApplet.xml", NULL);
ui_path = g_build_filename (FISH_MENU_UI_DIR, "fish-menu.xml", NULL);
panel_applet_setup_menu_from_file (applet, ui_path, action_group);
g_free (ui_path);
......
......@@ -9,7 +9,7 @@ _Description=From Whence That Stupid Fish Came
_Name=Fish
_Description=Display a swimming fish or another animated creature
Icon=gnome-panel-fish
BonoboId=OAFIID:GNOME_FishApplet
BonoboId=OAFIID:GNOME_FishApplet;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gnome-panel
X-GNOME-Bugzilla-Component=fish
......
......@@ -55,7 +55,7 @@ notification_area_applet_CFLAGS =
endif
appletdir = $(datadir)/gnome-panel/applets
applet_in_files = GNOME_NotificationAreaApplet.panel-applet.in
applet_in_files = org.gnome.panel.NotificationAreaApplet.panel-applet.in
applet_DATA = $(applet_in_files:.panel-applet.in=.panel-applet)
$(applet_in_files): $(applet_in_files).in Makefile
......@@ -78,13 +78,13 @@ org.gnome.panel.applet.NotificationAreaAppletFactory.service: $(service_in_files
$< > $@
endif
uidir = $(datadir)/gnome-2.0/ui
ui_DATA = GNOME_NotificationAreaApplet.xml
uidir = $(datadir)/gnome-panel/ui
ui_DATA = notification-area-menu.xml
EXTRA_DIST = \
GNOME_NotificationAreaApplet.panel-applet.in.in \
$(ui_DATA) \
$(service_in_files) \
EXTRA_DIST = \
org.gnome.panel.NotificationAreaApplet.panel-applet.in.in \
$(ui_DATA) \
$(service_in_files) \
na-marshal.list
BUILT_SOURCES = na-marshal.c na-marshal.h
......
......@@ -289,7 +289,7 @@ applet_factory (PanelApplet *applet,
menu_actions,
G_N_ELEMENTS (menu_actions),
data);
ui_path = g_build_filename (NOTIFICATION_AREA_MENU_UI_DIR, "GNOME_NotificationAreaApplet.xml", NULL);
ui_path = g_build_filename (NOTIFICATION_AREA_MENU_UI_DIR, "notification-area-menu.xml", NULL);
panel_applet_setup_menu_from_file (applet,
ui_path, action_group);
g_free (ui_path);
......
......@@ -3,13 +3,13 @@ Id=NotificationAreaAppletFactory
InProcess=@IN_PROCESS@
Location=@LOCATION@
_Name=Notification Area Factory
_Description=Notification Area Factory
_Description=Factory for notification area
[NotificationArea]
_Name=Notification Area
_Description=Area where notification icons appear
Icon=gnome-panel-notification-area
BonoboId=OAFIID:GNOME_NotificationAreaApplet;OAFIID:GNOME_SystemTrayApplet
BonoboId=OAFIID:GNOME_NotificationAreaApplet;OAFIID:GNOME_SystemTrayApplet;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gnome-panel
X-GNOME-Bugzilla-Component=notification area
......
......@@ -56,14 +56,14 @@ wnck_applet_CFLAGS =
endif
EXTRA_DIST = \
GNOME_Wncklet.panel-applet.in.in \
org.gnome.panel.Wncklet.panel-applet.in.in \
$(service_in_files) \
$(xmlui_DATA) \
$(schemas_in_files) \
$(ui_DATA)
appletdir = $(datadir)/gnome-panel/applets
applet_in_files = GNOME_Wncklet.panel-applet.in
applet_in_files = org.gnome.panel.Wncklet.panel-applet.in
applet_DATA = $(applet_in_files:.panel-applet.in=.panel-applet)
$(applet_in_files): $(applet_in_files).in Makefile
......@@ -88,12 +88,12 @@ endif
CLEANFILES = $(BUILT_SOURCES) $(schemas_DATA) $(applet_DATA) $(applet_DATA).in $(service_DATA)
xmluidir = $(datadir)/gnome-2.0/ui
xmluidir = $(datadir)/gnome-panel/ui
xmlui_DATA = \
GNOME_WindowMenuApplet.xml \
GNOME_WorkspaceSwitcherApplet.xml \
GNOME_ShowDesktopApplet.xml \
GNOME_WindowListApplet.xml
window-menu-menu.xml \
workspace-switcher-menu.xml \
showdesktop-menu.xml \
window-list-menu.xml
schemasdir = $(GCONF_SCHEMA_FILE_DIR)
schemas_in_files = workspace-switcher.schemas.in window-list.schemas.in
......
......@@ -9,7 +9,7 @@ _Description=Factory for the window navigation related applets
_Name=Window Selector
_Description=Switch between open windows using a menu
Icon=gnome-panel-window-menu
BonoboId=OAFIID:GNOME_WindowMenuApplet
BonoboId=OAFIID:GNOME_WindowMenuApplet;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gnome-panel
X-GNOME-Bugzilla-Component=window selector
......@@ -20,7 +20,7 @@ X-GNOME-Bugzilla-OtherBinaries=wnck-applet
_Name=Workspace Switcher
_Description=Switch between workspaces
Icon=gnome-panel-workspace-switcher
BonoboId=OAFIID:GNOME_WorkspaceSwitcherApplet;OAFIID:GNOME_PagerApplet
BonoboId=OAFIID:GNOME_WorkspaceSwitcherApplet;OAFIID:GNOME_PagerApplet;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gnome-panel
X-GNOME-Bugzilla-Component=workspace switcher
......@@ -31,7 +31,7 @@ X-GNOME-Bugzilla-OtherBinaries=wnck-applet
_Name=Window List
_Description=Switch between open windows using buttons
Icon=gnome-panel-window-list
BonoboId=OAFIID:GNOME_TasklistApplet;OAFIID:GNOME_WindowListApplet
BonoboId=OAFIID:GNOME_TasklistApplet;OAFIID:GNOME_WindowListApplet;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gnome-panel
X-GNOME-Bugzilla-Component=window list
......@@ -42,7 +42,7 @@ X-GNOME-Bugzilla-OtherBinaries=wnck-applet
_Name=Show Desktop
_Description=Hide application windows and show the desktop
Icon=user-desktop
BonoboId=OAFIID:GNOME_ShowDesktopApplet
BonoboId=OAFIID:GNOME_ShowDesktopApplet;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gnome-panel
X-GNOME-Bugzilla-Component=Show Desktop Button
......
......@@ -50,7 +50,7 @@ typedef struct {
GtkWidget *image;
GtkWidget *about_dialog;
PanelAppletOrient orient;
GtkOrientation orient;
int size;
WnckScreen *wnck_screen;
......@@ -487,7 +487,7 @@ show_desktop_applet_fill (PanelApplet *applet)
show_desktop_menu_actions,
G_N_ELEMENTS (show_desktop_menu_actions),
sdd);
ui_path = g_build_filename (WNCK_MENU_UI_DIR, "GNOME_ShowDesktopApplet.xml", NULL);
ui_path = g_build_filename (WNCK_MENU_UI_DIR, "showdesktop-menu.xml", NULL);
panel_applet_setup_menu_from_file (PANEL_APPLET (sdd->applet),
ui_path, action_group);
g_free (ui_path);
......
......@@ -566,7 +566,7 @@ window_list_applet_fill (PanelApplet *applet)
tasklist_menu_actions,
G_N_ELEMENTS (tasklist_menu_actions),
tasklist);
ui_path = g_build_filename (WNCK_MENU_UI_DIR, "GNOME_WindowListApplet.xml", NULL);
ui_path = g_build_filename (WNCK_MENU_UI_DIR, "window-list-menu.xml", NULL);
panel_applet_setup_menu_from_file (PANEL_APPLET (tasklist->applet),
ui_path, action_group);
g_free (ui_path);
......
......@@ -259,7 +259,7 @@ window_menu_applet_fill (PanelApplet *applet)
window_menu_actions,
G_N_ELEMENTS (window_menu_actions),
window_menu);
ui_path = g_build_filename (WNCK_MENU_UI_DIR, "GNOME_WindowMenuApplet.xml", NULL);
ui_path = g_build_filename (WNCK_MENU_UI_DIR, "window-menu-menu.xml", NULL);
panel_applet_setup_menu_from_file (applet, ui_path, action_group);
g_free (ui_path);
g_object_unref (action_group);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment