[gnome-panel/bonobo-less: 92/93] [all] Various cleanups/tiny fixes
- From: Vincent Untz <vuntz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-panel/bonobo-less: 92/93] [all] Various cleanups/tiny fixes
- Date: Wed, 26 May 2010 08:34:00 +0000 (UTC)
commit 73ffa70ae87590118f470887232e2e567765d8c6
Author: Vincent Untz <vuntz gnome org>
Date: Wed May 26 09:43:30 2010 +0200
[all] Various cleanups/tiny fixes
Those are all small changes I want to do before the merge.
applets/clock/Makefile.am | 8 +-
.../{GNOME_ClockApplet.xml => clock-menu.xml} | 0
applets/clock/clock.c | 2 +-
...org.gnome.panel.ClockApplet.panel-applet.in.in} | 4 +-
applets/fish/Makefile.am | 20 +++---
.../fish/{GNOME_FishApplet.xml => fish-menu.xml} | 0
applets/fish/fish.c | 2 +-
... org.gnome.panel.FishApplet.panel-applet.in.in} | 2 +-
applets/notification_area/Makefile.am | 14 ++--
applets/notification_area/main.c | 2 +-
...onAreaApplet.xml => notification-area-menu.xml} | 0
...anel.NotificationAreaApplet.panel-applet.in.in} | 4 +-
applets/wncklet/Makefile.am | 14 ++--
... => org.gnome.panel.Wncklet.panel-applet.in.in} | 8 +-
..._ShowDesktopApplet.xml => showdesktop-menu.xml} | 0
applets/wncklet/showdesktop.c | 4 +-
...E_WindowListApplet.xml => window-list-menu.xml} | 0
applets/wncklet/window-list.c | 2 +-
...E_WindowMenuApplet.xml => window-menu-menu.xml} | 0
applets/wncklet/window-menu.c | 2 +-
applets/wncklet/wncklet.c | 2 +-
...tcherApplet.xml => workspace-switcher-menu.xml} | 0
applets/wncklet/workspace-switcher.c | 5 +-
configure.in | 2 -
gnome-panel/applet.c | 2 +-
gnome-panel/gnome-panel-add.in | 5 +-
.../panel-applet-container.c | 10 ++--
.../panel-applet-frame-dbus.c | 2 +-
.../panel-applets-manager-dbus.c | 52 +++++++---------
gnome-panel/main.c | 1 -
gnome-panel/panel-object.schemas.in | 9 ++-
gnome-panel/panel-shell.c | 7 +-
gnome-panel/xstuff.c | 10 +--
libpanel-applet/Makefile.am | 12 ++--
.../libpanelapplet-2.0-uninstalled.pc.in | 2 +-
libpanel-applet/libpanelapplet-2.0.pc.in | 2 +-
... => org.gnome.panel.TestApplet.panel-applet.in} | 6 +-
libpanel-applet/panel-applet-factory.c | 19 +++---
libpanel-applet/panel-applet-factory.h | 8 +++
libpanel-applet/panel-applet.c | 65 ++++++++++----------
libpanel-applet/panel-applet.h | 20 ++-----
libpanel-applet/test-dbus-applet.c | 10 ++--
po/POTFILES.in | 16 +++---
43 files changed, 173 insertions(+), 182 deletions(-)
---
diff --git a/applets/clock/Makefile.am b/applets/clock/Makefile.am
index 6e940ff..588b858 100644
--- a/applets/clock/Makefile.am
+++ b/applets/clock/Makefile.am
@@ -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) \
diff --git a/applets/clock/GNOME_ClockApplet.xml b/applets/clock/clock-menu.xml
similarity index 100%
rename from applets/clock/GNOME_ClockApplet.xml
rename to applets/clock/clock-menu.xml
diff --git a/applets/clock/clock.c b/applets/clock/clock.c
index fa00a7b..9786234 100644
--- a/applets/clock/clock.c
+++ b/applets/clock/clock.c
@@ -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);
diff --git a/applets/clock/GNOME_ClockApplet.panel-applet.in.in b/applets/clock/org.gnome.panel.ClockApplet.panel-applet.in.in
similarity index 82%
rename from applets/clock/GNOME_ClockApplet.panel-applet.in.in
rename to applets/clock/org.gnome.panel.ClockApplet.panel-applet.in.in
index 6840054..a63fb12 100644
--- a/applets/clock/GNOME_ClockApplet.panel-applet.in.in
+++ b/applets/clock/org.gnome.panel.ClockApplet.panel-applet.in.in
@@ -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
diff --git a/applets/fish/Makefile.am b/applets/fish/Makefile.am
index 34c7140..d22d24f 100644
--- a/applets/fish/Makefile.am
+++ b/applets/fish/Makefile.am
@@ -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
diff --git a/applets/fish/GNOME_FishApplet.xml b/applets/fish/fish-menu.xml
similarity index 100%
rename from applets/fish/GNOME_FishApplet.xml
rename to applets/fish/fish-menu.xml
diff --git a/applets/fish/fish.c b/applets/fish/fish.c
index f6652d7..b732043 100644
--- a/applets/fish/fish.c
+++ b/applets/fish/fish.c
@@ -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);
diff --git a/applets/fish/GNOME_FishApplet.panel-applet.in.in b/applets/fish/org.gnome.panel.FishApplet.panel-applet.in.in
similarity index 92%
rename from applets/fish/GNOME_FishApplet.panel-applet.in.in
rename to applets/fish/org.gnome.panel.FishApplet.panel-applet.in.in
index 561c89b..18d24dd 100644
--- a/applets/fish/GNOME_FishApplet.panel-applet.in.in
+++ b/applets/fish/org.gnome.panel.FishApplet.panel-applet.in.in
@@ -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
diff --git a/applets/notification_area/Makefile.am b/applets/notification_area/Makefile.am
index 91938fe..5478cd7 100644
--- a/applets/notification_area/Makefile.am
+++ b/applets/notification_area/Makefile.am
@@ -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
diff --git a/applets/notification_area/main.c b/applets/notification_area/main.c
index 33632f3..86a06e5 100644
--- a/applets/notification_area/main.c
+++ b/applets/notification_area/main.c
@@ -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);
diff --git a/applets/notification_area/GNOME_NotificationAreaApplet.xml b/applets/notification_area/notification-area-menu.xml
similarity index 100%
rename from applets/notification_area/GNOME_NotificationAreaApplet.xml
rename to applets/notification_area/notification-area-menu.xml
diff --git a/applets/notification_area/GNOME_NotificationAreaApplet.panel-applet.in.in b/applets/notification_area/org.gnome.panel.NotificationAreaApplet.panel-applet.in.in
similarity index 90%
rename from applets/notification_area/GNOME_NotificationAreaApplet.panel-applet.in.in
rename to applets/notification_area/org.gnome.panel.NotificationAreaApplet.panel-applet.in.in
index 21a0d71..fac8476 100644
--- a/applets/notification_area/GNOME_NotificationAreaApplet.panel-applet.in.in
+++ b/applets/notification_area/org.gnome.panel.NotificationAreaApplet.panel-applet.in.in
@@ -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
diff --git a/applets/wncklet/Makefile.am b/applets/wncklet/Makefile.am
index 65617c1..cf45fee 100644
--- a/applets/wncklet/Makefile.am
+++ b/applets/wncklet/Makefile.am
@@ -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
diff --git a/applets/wncklet/GNOME_Wncklet.panel-applet.in.in b/applets/wncklet/org.gnome.panel.Wncklet.panel-applet.in.in
similarity index 94%
rename from applets/wncklet/GNOME_Wncklet.panel-applet.in.in
rename to applets/wncklet/org.gnome.panel.Wncklet.panel-applet.in.in
index ac84fe8..b2ab215 100644
--- a/applets/wncklet/GNOME_Wncklet.panel-applet.in.in
+++ b/applets/wncklet/org.gnome.panel.Wncklet.panel-applet.in.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
diff --git a/applets/wncklet/GNOME_ShowDesktopApplet.xml b/applets/wncklet/showdesktop-menu.xml
similarity index 100%
rename from applets/wncklet/GNOME_ShowDesktopApplet.xml
rename to applets/wncklet/showdesktop-menu.xml
diff --git a/applets/wncklet/showdesktop.c b/applets/wncklet/showdesktop.c
index e6a46bb..ff7cc67 100644
--- a/applets/wncklet/showdesktop.c
+++ b/applets/wncklet/showdesktop.c
@@ -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);
diff --git a/applets/wncklet/GNOME_WindowListApplet.xml b/applets/wncklet/window-list-menu.xml
similarity index 100%
rename from applets/wncklet/GNOME_WindowListApplet.xml
rename to applets/wncklet/window-list-menu.xml
diff --git a/applets/wncklet/window-list.c b/applets/wncklet/window-list.c
index 0b713ef..a93cf79 100644
--- a/applets/wncklet/window-list.c
+++ b/applets/wncklet/window-list.c
@@ -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);
diff --git a/applets/wncklet/GNOME_WindowMenuApplet.xml b/applets/wncklet/window-menu-menu.xml
similarity index 100%
rename from applets/wncklet/GNOME_WindowMenuApplet.xml
rename to applets/wncklet/window-menu-menu.xml
diff --git a/applets/wncklet/window-menu.c b/applets/wncklet/window-menu.c
index 8d96ffc..0aa39d6 100644
--- a/applets/wncklet/window-menu.c
+++ b/applets/wncklet/window-menu.c
@@ -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);
diff --git a/applets/wncklet/wncklet.c b/applets/wncklet/wncklet.c
index 0bc37ae..cfa5f6a 100644
--- a/applets/wncklet/wncklet.c
+++ b/applets/wncklet/wncklet.c
@@ -221,7 +221,7 @@ wncklet_factory (PanelApplet *applet,
#ifdef WNCKLET_INPROCESS
PANEL_APPLET_IN_PROCESS_FACTORY ("WnckletFactory",
PANEL_TYPE_APPLET,
- "Windo wNavigationApplets",
+ "WindowNavigationApplets",
wncklet_factory,
NULL)
#else
diff --git a/applets/wncklet/GNOME_WorkspaceSwitcherApplet.xml b/applets/wncklet/workspace-switcher-menu.xml
similarity index 100%
rename from applets/wncklet/GNOME_WorkspaceSwitcherApplet.xml
rename to applets/wncklet/workspace-switcher-menu.xml
diff --git a/applets/wncklet/workspace-switcher.c b/applets/wncklet/workspace-switcher.c
index 537c35e..bcb31c6 100644
--- a/applets/wncklet/workspace-switcher.c
+++ b/applets/wncklet/workspace-switcher.c
@@ -570,7 +570,8 @@ workspace_switcher_applet_fill (PanelApplet *applet)
"change_background",
G_CALLBACK (applet_change_background),
pager);
- gtk_widget_show (pager->applet);
+
+ gtk_widget_show (pager->applet);
panel_applet_set_background_widget (PANEL_APPLET (pager->applet),
GTK_WIDGET (pager->applet));
@@ -581,7 +582,7 @@ workspace_switcher_applet_fill (PanelApplet *applet)
pager_menu_actions,
G_N_ELEMENTS (pager_menu_actions),
pager);
- ui_path = g_build_filename (WNCK_MENU_UI_DIR, "GNOME_WorkspaceSwitcherApplet.xml", NULL);
+ ui_path = g_build_filename (WNCK_MENU_UI_DIR, "workspace-switcher-menu.xml", NULL);
panel_applet_setup_menu_from_file (PANEL_APPLET (pager->applet),
ui_path, action_group);
g_free (ui_path);
diff --git a/configure.in b/configure.in
index fe04238..4b47ac8 100644
--- a/configure.in
+++ b/configure.in
@@ -66,7 +66,6 @@ LIBECAL_REQUIRED=1.6.0
LIBEDATASERVER_REQUIRED=1.2.0
LIBEDATASERVERUI_REQUIRED=1.2.0
CAIRO_REQUIRED=1.0.0
-DBUS_GLIB_REQUIRED=0.60
GWEATHER_REQUIRED=2.27.90
dnl pkg-config dependency checks
@@ -135,7 +134,6 @@ AC_SUBST(CLOCK_MECHANISM_CFLAGS)
AC_SUBST(CLOCK_MECHANISM_LIBS)
POLKIT_REQUIRED=0.91
-DBUS_GLIB_REQUIRED=0.71
DBUS_REQUIRED=1.1.2
NETWORK_MANAGER_REQUIRED=0.6
diff --git a/gnome-panel/applet.c b/gnome-panel/applet.c
index c441250..f1e0a94 100644
--- a/gnome-panel/applet.c
+++ b/gnome-panel/applet.c
@@ -982,7 +982,7 @@ panel_applet_load_idle_handler (gpointer dummy)
break;
}
- /* Only the bonobo applets will do a late stop_loading */
+ /* Only the real applets will do a late stop_loading */
if (applet->type != PANEL_OBJECT_APPLET)
panel_applet_stop_loading (applet->id);
diff --git a/gnome-panel/gnome-panel-add.in b/gnome-panel/gnome-panel-add.in
index 0709b6f..f5af10e 100644
--- a/gnome-panel/gnome-panel-add.in
+++ b/gnome-panel/gnome-panel-add.in
@@ -111,11 +111,12 @@ class PanelAdder:
raise PanelAddException('Cannot find a panel identifier')
def _get_applet_list(self):
- dirs = os.getenv('PANEL_APPLETS_DIR')
+ dirs = os.getenv('GNOME_PANEL_APPLETS_DIR')
if not dirs:
dirs = PANEL_APPLETS_PATH
- retval = dups = []
+ retval = []
+ dups = []
for path in dirs.split(":"):
if not os.path.isdir(path):
continue
diff --git a/gnome-panel/libpanel-applet-private/panel-applet-container.c b/gnome-panel/libpanel-applet-private/panel-applet-container.c
index 84110e5..b83bcd6 100644
--- a/gnome-panel/libpanel-applet-private/panel-applet-container.c
+++ b/gnome-panel/libpanel-applet-private/panel-applet-container.c
@@ -95,7 +95,7 @@ panel_applet_container_init (PanelAppletContainer *container)
container->priv->pending_ops = g_hash_table_new_full (g_direct_hash,
g_direct_equal,
NULL,
- (GDestroyNotify)g_object_unref);
+ (GDestroyNotify) g_object_unref);
gtk_container_add (GTK_CONTAINER (container),
container->priv->socket);
@@ -343,7 +343,7 @@ on_proxy_appeared (GDBusConnection *connection,
"PropertiesChanged",
g_dbus_proxy_get_object_path (proxy),
PANEL_APPLET_INTERFACE,
- (GDBusSignalCallback)on_property_changed,
+ (GDBusSignalCallback) on_property_changed,
container, NULL);
g_simple_async_result_complete (result);
@@ -392,7 +392,7 @@ get_applet_cb (GObject *source_object,
PANEL_APPLET_INTERFACE,
G_TYPE_DBUS_PROXY,
G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
- (GBusProxyAppearedCallback)on_proxy_appeared,
+ (GBusProxyAppearedCallback) on_proxy_appeared,
NULL,
result,
NULL);
@@ -497,7 +497,7 @@ panel_applet_container_get_applet (PanelAppletContainer *container,
(GBusNameAppearedCallback) on_factory_appeared,
NULL,
data,
- (GDestroyNotify)applet_factory_data_free);
+ (GDestroyNotify) applet_factory_data_free);
g_free (bus_name);
}
@@ -650,7 +650,7 @@ get_applet_property_cb (GObject *source_object,
value = g_variant_get_variant (item);
g_variant_unref (item);
g_simple_async_result_set_op_res_gpointer (result, value,
- (GDestroyNotify)g_variant_unref);
+ (GDestroyNotify) g_variant_unref);
g_variant_unref (retvals);
}
diff --git a/gnome-panel/libpanel-applet-private/panel-applet-frame-dbus.c b/gnome-panel/libpanel-applet-private/panel-applet-frame-dbus.c
index dd1d1e6..e6ab44d 100644
--- a/gnome-panel/libpanel-applet-private/panel-applet-frame-dbus.c
+++ b/gnome-panel/libpanel-applet-private/panel-applet-frame-dbus.c
@@ -46,7 +46,7 @@ struct _PanelAppletFrameDBusPrivate
GCancellable *bg_cancellable;
};
-/* Keep in sync with panel-applet.h. Uggh. */
+/* Keep in sync with panel-applet.h. Uggh. */
typedef enum {
APPLET_FLAGS_NONE = 0,
APPLET_EXPAND_MAJOR = 1 << 0,
diff --git a/gnome-panel/libpanel-applet-private/panel-applets-manager-dbus.c b/gnome-panel/libpanel-applet-private/panel-applets-manager-dbus.c
index 67eed60..6f3e208 100644
--- a/gnome-panel/libpanel-applet-private/panel-applets-manager-dbus.c
+++ b/gnome-panel/libpanel-applet-private/panel-applets-manager-dbus.c
@@ -74,7 +74,7 @@ panel_applet_factory_info_free (PanelAppletFactoryInfo *info)
g_free (info->id);
g_free (info->location);
g_list_foreach (info->applet_list,
- (GFunc)panel_applet_info_free,
+ (GFunc) panel_applet_info_free,
NULL);
g_list_free (info->applet_list);
info->applet_list = NULL;
@@ -207,7 +207,7 @@ panel_applets_manager_get_applets_dirs (void)
paths = g_strsplit (dir, ":", 0);
for (i = 0; paths[i]; i++) {
- if (g_slist_find_custom (retval, paths[i], (GCompareFunc)g_strcmp0))
+ if (g_slist_find_custom (retval, paths[i], (GCompareFunc) g_strcmp0))
continue;
retval = g_slist_prepend (retval, g_strdup (paths[i]));
}
@@ -252,31 +252,29 @@ applets_directory_changed (GFileMonitor *monitor,
return;
}
- /* Make sure we don't update an applet
- * that has changed in another source dir
- * unless it takes precedence over the
- * current one
- */
+ /* Make sure we don't update an applet that has changed in
+ * another source dir unless it takes precedence over the
+ * current one */
if (g_strcmp0 (info->srcdir, old_info->srcdir) == 0) {
- g_hash_table_insert (manager->priv->applet_factories, g_strdup (info->id), info);
+ g_hash_table_replace (manager->priv->applet_factories, g_strdup (info->id), info);
return;
}
dirs = panel_applets_manager_get_applets_dirs ();
for (d = dirs; d; d = g_slist_next (d)) {
- gchar *path = (gchar *)d->data;
+ gchar *path = (gchar *) d->data;
if (g_strcmp0 (path, old_info->srcdir) == 0) {
panel_applet_factory_info_free (info);
break;
} else if (g_strcmp0 (path, info->srcdir) == 0) {
- g_hash_table_insert (manager->priv->applet_factories, g_strdup (info->id), info);
+ g_hash_table_replace (manager->priv->applet_factories, g_strdup (info->id), info);
break;
}
}
- g_slist_foreach (dirs, (GFunc)g_free, NULL);
+ g_slist_foreach (dirs, (GFunc) g_free, NULL);
g_slist_free (dirs);
}
break;
@@ -286,20 +284,19 @@ applets_directory_changed (GFileMonitor *monitor,
}
}
-static gboolean
-panel_applets_manager_load_applet_infos (PanelAppletsManagerDBus *manager)
+static void
+panel_applets_manager_dbus_load_applet_infos (PanelAppletsManagerDBus *manager)
{
GSList *dirs, *d;
GDir *dir;
const gchar *dirent;
GError *error = NULL;
- gboolean retval = FALSE;
dirs = panel_applets_manager_get_applets_dirs ();
for (d = dirs; d; d = g_slist_next (d)) {
GFileMonitor *monitor;
GFile *dir_file;
- gchar *path = (gchar *)d->data;
+ gchar *path = (gchar *) d->data;
dir = g_dir_open (path, 0, &error);
if (!dir) {
@@ -343,7 +340,6 @@ panel_applets_manager_load_applet_infos (PanelAppletsManagerDBus *manager)
}
g_hash_table_insert (manager->priv->applet_factories, g_strdup (info->id), info);
- retval = TRUE;
}
g_dir_close (dir);
@@ -351,8 +347,6 @@ panel_applets_manager_load_applet_infos (PanelAppletsManagerDBus *manager)
}
g_slist_free (dirs);
-
- return retval;
}
static GList *
@@ -368,7 +362,7 @@ panel_applets_manager_dbus_get_applets (PanelAppletsManager *manager)
while (g_hash_table_iter_next (&iter, &key, &value)) {
PanelAppletFactoryInfo *info;
- info = (PanelAppletFactoryInfo *)value;
+ info = (PanelAppletFactoryInfo *) value;
retval = g_list_concat (retval, g_list_copy (info->applet_list));
}
@@ -431,7 +425,7 @@ panel_applets_manager_dbus_factory_activate (PanelAppletsManager *manager,
return FALSE;
}
- if (!g_module_symbol (info->module, "_panel_applet_shlib_factory", (gpointer *)&activate_applet)) {
+ if (!g_module_symbol (info->module, "_panel_applet_shlib_factory", (gpointer *) &activate_applet)) {
/* FIXME: use a GError? */
g_warning ("Failed to load applet %s: %s\n",
iid, g_module_error ());
@@ -474,10 +468,10 @@ panel_applets_manager_dbus_factory_deactivate (PanelAppletsManager *manager,
if (!info->module)
return TRUE;
- if (--info->n_applets == 0) {
- /* FIXME: we should close the module here,
- * however applet types are registered static
- */
+ info->n_applets--;
+ if (info->n_applets == 0) {
+ /* FIXME: we should close the module here, however applet types
+ * are registered static */
#if 0
g_module_close (info->module);
info->module = NULL;
@@ -499,7 +493,7 @@ panel_applets_manager_dbus_get_applet_info (PanelAppletsManager *manager,
return NULL;
for (l = info->applet_list; l; l = g_list_next (l)) {
- PanelAppletInfo *ainfo = (PanelAppletInfo *)l->data;
+ PanelAppletInfo *ainfo = (PanelAppletInfo *) l->data;
if (g_strcmp0 (panel_applet_info_get_iid (ainfo), iid) == 0)
return ainfo;
@@ -522,7 +516,7 @@ panel_applets_manager_dbus_get_applet_info_from_old_id (PanelAppletsManager *man
PanelAppletFactoryInfo *info;
GList *l;
- info = (PanelAppletFactoryInfo *)value;
+ info = (PanelAppletFactoryInfo *) value;
if (!info->has_old_ids)
continue;
@@ -531,7 +525,7 @@ panel_applets_manager_dbus_get_applet_info_from_old_id (PanelAppletsManager *man
gint i = 0;
const gchar * const *old_ids;
- ainfo = (PanelAppletInfo *)l->data;
+ ainfo = (PanelAppletInfo *) l->data;
old_ids = panel_applet_info_get_old_ids (ainfo);
@@ -563,7 +557,7 @@ panel_applets_manager_dbus_finalize (GObject *object)
PanelAppletsManagerDBus *manager = PANEL_APPLETS_MANAGER_DBUS (object);
if (manager->priv->monitors) {
- g_list_foreach (manager->priv->monitors, (GFunc)g_object_unref, NULL);
+ g_list_foreach (manager->priv->monitors, (GFunc) g_object_unref, NULL);
g_list_free (manager->priv->monitors);
manager->priv->monitors = NULL;
}
@@ -588,7 +582,7 @@ panel_applets_manager_dbus_init (PanelAppletsManagerDBus *manager)
(GDestroyNotify) g_free,
(GDestroyNotify) panel_applet_factory_info_free);
- panel_applets_manager_load_applet_infos (manager);
+ panel_applets_manager_dbus_load_applet_infos (manager);
}
static void
diff --git a/gnome-panel/main.c b/gnome-panel/main.c
index 0f09ee3..fa5ffff 100644
--- a/gnome-panel/main.c
+++ b/gnome-panel/main.c
@@ -30,7 +30,6 @@
#include "panel-action-protocol.h"
#include "panel-lockdown.h"
#include "panel-icon-names.h"
-#include "panel-applets-manager.h"
#include "xstuff.h"
#include "nothing.cP"
diff --git a/gnome-panel/panel-object.schemas.in b/gnome-panel/panel-object.schemas.in
index ceb6e4f..00d718a 100644
--- a/gnome-panel/panel-object.schemas.in
+++ b/gnome-panel/panel-object.schemas.in
@@ -87,9 +87,10 @@
<locale name="C">
<short>Applet Bonobo IID</short>
<long>
- The Bonobo implementation ID of the applet - e.g.
- "OAFIID:GNOME_ClockApplet". This key is only
- relevant if the object_type key is "bonobo-applet".
+ This key is deprecated, following the migration to a new library for
+ applets. The Bonobo implementation ID of the applet - e.g.
+ "OAFIID:GNOME_ClockApplet". This key is only relevant if the
+ object_type key is "bonobo-applet".
</long>
</locale>
</schema>
@@ -104,7 +105,7 @@
<long>
The implementation ID of the applet - e.g.
"ClockAppletFactory::ClockApplet". This key is only
- relevant if the object_type key is "panel-applet".
+ relevant if the object_type key is "bonobo-applet".
</long>
</locale>
</schema>
diff --git a/gnome-panel/panel-shell.c b/gnome-panel/panel-shell.c
index c5b9c7c..fd1cd21 100644
--- a/gnome-panel/panel-shell.c
+++ b/gnome-panel/panel-shell.c
@@ -81,10 +81,9 @@ panel_shell_register (gboolean replace)
panel_cleanup_register (PANEL_CLEAN_FUNC (panel_shell_cleanup), NULL);
- /* There isn't a sync version of g_bus_own_name,
- * so we have to requeste the name manually here.
- * there's no ui yet so it's safe using sync api
- */
+ /* There isn't a sync version of g_bus_own_name, so we have to requeste
+ * the name manually here. There's no ui yet so it's safe to use this
+ * sync api */
dbus_connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
if (dbus_connection == NULL) {
g_warning ("Cannot register the panel shell: %s", error->message);
diff --git a/gnome-panel/xstuff.c b/gnome-panel/xstuff.c
index edcc4a2..b7db414 100644
--- a/gnome-panel/xstuff.c
+++ b/gnome-panel/xstuff.c
@@ -715,12 +715,10 @@ xstuff_x_error_handler (Display *display, XErrorEvent *error)
if (!error->error_code)
return 0;
- /*
- * If we got a BadDrawable or a BadWindow, we ignore it for
- * now. FIXME: We need to somehow distinguish real errors
- * from X-server-induced errors. Keeping a list of windows
- * for which we will ignore BadDrawables would be a good idea.
- */
+ /* If we got a BadDrawable or a BadWindow, we ignore it for now.
+ * FIXME: We need to somehow distinguish real errors from
+ * X-server-induced errors. Keeping a list of windows for which we will
+ * ignore BadDrawables would be a good idea. */
if (error->error_code == BadDrawable ||
error->error_code == BadWindow)
return 0;
diff --git a/libpanel-applet/Makefile.am b/libpanel-applet/Makefile.am
index 9ce4110..2b31796 100644
--- a/libpanel-applet/Makefile.am
+++ b/libpanel-applet/Makefile.am
@@ -18,7 +18,7 @@ libpanel_applet_2_la_SOURCES = \
panel-applet-gconf.h
libpanel_applet_2_la_LDFLAGS = \
- -version-info $(LIB_PANEL_APPLET_LT_VERSION) \
+ -version-info $(LIB_PANEL_APPLET_LT_VERSION) \
-no-undefined
libpanel_applet_2_la_LIBADD = \
@@ -46,10 +46,10 @@ BUILT_SOURCES = \
$(libpanel_applet_2_la_OBJECTS) $(test_dbus_applet_OBJECTS): $(BUILT_SOURCES)
-EXTRA_DIST = \
- GNOME_Panel_TestApplet.panel-applet.in \
- panel-applet-marshal.list \
- libpanelapplet-2.0.pc.in \
+EXTRA_DIST = \
+ org.gnome.panel.TestApplet.panel-applet.in \
+ panel-applet-marshal.list \
+ libpanelapplet-2.0.pc.in \
libpanelapplet-2.0-uninstalled.pc.in
panel-applet-marshal.h: panel-applet-marshal.list $(GLIB_GENMARSHAL)
@@ -95,7 +95,7 @@ pkgconfig_DATA = libpanelapplet-2.0.pc
CLEANFILES = $(BUILT_SOURCES) $(noinst_DATA)
appletdir = $(datadir)/gnome-panel/applets
-applet_in_files = GNOME_Panel_TestApplet.panel-applet.in
+applet_in_files = org.gnome.panel.TestApplet.panel-applet.in
noinst_DATA = $(applet_in_files:.panel-applet.in=.panel-applet)
@PANEL_INTLTOOL_PANEL_APPLET_RULE@
diff --git a/libpanel-applet/libpanelapplet-2.0-uninstalled.pc.in b/libpanel-applet/libpanelapplet-2.0-uninstalled.pc.in
index 20324c2..e00ab6f 100644
--- a/libpanel-applet/libpanelapplet-2.0-uninstalled.pc.in
+++ b/libpanel-applet/libpanelapplet-2.0-uninstalled.pc.in
@@ -5,7 +5,7 @@ includedir= includedir@
Name: libpanel-applet-2
Description: libpanel-applet-2
-Requires: gconf-2.0 gtk+-2.0 eggdbus-1
+Requires: glib-2.0 gconf-2.0 gtk+-2.0
Version: @VERSION@
Libs: ${pc_top_builddir}/${pcfiledir}/libpanel-applet-2.la
Cflags: -I${pc_top_builddir}/${pcfiledir}
diff --git a/libpanel-applet/libpanelapplet-2.0.pc.in b/libpanel-applet/libpanelapplet-2.0.pc.in
index e6fd6b0..b9eb316 100644
--- a/libpanel-applet/libpanelapplet-2.0.pc.in
+++ b/libpanel-applet/libpanelapplet-2.0.pc.in
@@ -5,7 +5,7 @@ includedir= includedir@
Name: libpanel-applet-2
Description: libpanel-applet-2
-Requires: gconf-2.0 gtk+-2.0 eggdbus-1
+Requires: glib-2.0 gconf-2.0 gtk+-2.0
Version: @VERSION@
Libs: -L${libdir} -lpanel-applet-2
Cflags: -I${includedir}/panel-2.0
diff --git a/libpanel-applet/GNOME_Panel_TestApplet.panel-applet.in b/libpanel-applet/org.gnome.panel.TestApplet.panel-applet.in
similarity index 52%
rename from libpanel-applet/GNOME_Panel_TestApplet.panel-applet.in
rename to libpanel-applet/org.gnome.panel.TestApplet.panel-applet.in
index e0641d7..8928c30 100644
--- a/libpanel-applet/GNOME_Panel_TestApplet.panel-applet.in
+++ b/libpanel-applet/org.gnome.panel.TestApplet.panel-applet.in
@@ -2,9 +2,9 @@
Id=TestAppletFactory
Location=test-dbus-applet
_Name=Test DBus Applet Factory
-_Description=Test DBus Applet Factory
+_Description=Factory for Test DBus Applet
[TestApplet]
_Name=Test DBus Applet
-_Description=A simple applet for testing the GNOME-2.0 panel
-Icon=gnome-gegl.png
+_Description=A simple applet for testing the GNOME panel
+Icon=gnome-gegl
diff --git a/libpanel-applet/panel-applet-factory.c b/libpanel-applet/panel-applet-factory.c
index 6895521..ffe0998 100644
--- a/libpanel-applet/panel-applet-factory.c
+++ b/libpanel-applet/panel-applet-factory.c
@@ -19,16 +19,17 @@
* Boston, MA 02111-1307, USA.
*/
-#include "panel-applet-factory.h"
#include "panel-applet.h"
+#include "panel-applet-factory.h"
+
struct _PanelAppletFactory {
- GObject base;
+ GObject base;
- gchar *factory_id;
- guint n_applets;
- GType applet_type;
- GClosure *closure;
+ gchar *factory_id;
+ guint n_applets;
+ GType applet_type;
+ GClosure *closure;
};
struct _PanelAppletFactoryClass {
@@ -75,7 +76,8 @@ static void
panel_applet_factory_applet_removed (PanelAppletFactory *factory,
GObject *applet)
{
- if (--factory->n_applets == 0)
+ factory->n_applets--;
+ if (factory->n_applets == 0)
g_object_unref (factory);
}
@@ -124,6 +126,7 @@ set_applet_constructor_properties (GObject *applet,
}
break;
default:
+ g_assert_not_reached ();
break;
}
}
@@ -152,7 +155,7 @@ panel_applet_factory_get_applet (PanelAppletFactory *factory,
"closure", factory->closure,
NULL);
factory->n_applets++;
- g_object_weak_ref (applet, (GWeakNotify)panel_applet_factory_applet_removed, factory);
+ g_object_weak_ref (applet, (GWeakNotify) panel_applet_factory_applet_removed, factory);
set_applet_constructor_properties (applet, props);
g_variant_unref (props);
diff --git a/libpanel-applet/panel-applet-factory.h b/libpanel-applet/panel-applet-factory.h
index 5207bd6..c424981 100644
--- a/libpanel-applet/panel-applet-factory.h
+++ b/libpanel-applet/panel-applet-factory.h
@@ -24,6 +24,8 @@
#include <glib-object.h>
+#include "panel-applet.h"
+
G_BEGIN_DECLS
#define PANEL_TYPE_APPLET_FACTORY (panel_applet_factory_get_type ())
@@ -40,6 +42,12 @@ PanelAppletFactory *panel_applet_factory_new (const gchar *a
GClosure *closure);
gboolean panel_applet_factory_register_service (PanelAppletFactory *factory);
+/* This technically belongs to panel-applet.h, but it's not something that
+ * should be public API. */
+guint32 panel_applet_get_xid (PanelApplet *applet,
+ GdkScreen *screen);
+const gchar *panel_applet_get_object_path (PanelApplet *applet);
+
G_END_DECLS
#endif /* PANEL_APPLET_FACTORY_H */
diff --git a/libpanel-applet/panel-applet.c b/libpanel-applet/panel-applet.c
index 7a89f3c..58015d6 100644
--- a/libpanel-applet/panel-applet.c
+++ b/libpanel-applet/panel-applet.c
@@ -31,8 +31,8 @@
#include <stdlib.h>
#include <string.h>
-#include <cairo.h>
#include <glib/gi18n-lib.h>
+#include <cairo.h>
#include <gdk/gdk.h>
#include <gdk/gdkx.h>
#include <gdk/gdkkeysyms.h>
@@ -303,8 +303,7 @@ panel_applet_set_preferences_key (PanelApplet *applet,
if (applet->priv->prefs_key == prefs_key)
return;
- if (applet->priv->prefs_key && prefs_key &&
- strcmp (applet->priv->prefs_key, prefs_key) == 0)
+ if (g_strcmp0 (applet->priv->prefs_key, prefs_key) == 0)
return;
if (applet->priv->prefs_key) {
@@ -421,9 +420,7 @@ panel_applet_set_size_hints (PanelApplet *applet,
{
gint i;
- /* Make sure property has really changed
- * to avoid bus traffic
- */
+ /* Make sure property has really changed to avoid bus traffic */
if (!panel_applet_size_hints_changed (applet, size_hints, n_elements, base_size))
return;
@@ -476,7 +473,8 @@ panel_applet_get_size (PanelApplet *applet)
return applet->priv->size;
}
-void
+/* Applets cannot set their size, so API is not public. */
+static void
panel_applet_set_size (PanelApplet *applet,
guint size)
{
@@ -501,7 +499,8 @@ panel_applet_get_orient (PanelApplet *applet)
return applet->priv->orient;
}
-void
+/* Applets cannot set their orientation, so API is not public. */
+static void
panel_applet_set_orient (PanelApplet *applet,
PanelAppletOrient orient)
{
@@ -518,15 +517,19 @@ panel_applet_set_orient (PanelApplet *applet,
g_object_notify (G_OBJECT (applet), "orient");
}
-gboolean
+#if 0
+/* Locked should not be public API: it's not useful for applet writers to know
+ * if the applet is locked (as opposed to locked_down). */
+static gboolean
panel_applet_get_locked (PanelApplet *applet)
{
g_return_val_if_fail (PANEL_IS_APPLET (applet), FALSE);
return applet->priv->locked;
}
+#endif
-void
+static void
panel_applet_set_locked (PanelApplet *applet,
gboolean locked)
{
@@ -578,7 +581,8 @@ panel_applet_get_locked_down (PanelApplet *applet)
return applet->priv->locked_down;
}
-void
+/* Applets cannot set the lockdown state, so API is not public. */
+static void
panel_applet_set_locked_down (PanelApplet *applet,
gboolean locked_down)
{
@@ -849,7 +853,7 @@ panel_applet_setup_menu_from_file (PanelApplet *applet,
panel_applet_setup_menu (applet, xml, applet_action_group);
} else {
g_warning ("%s", error->message);
- g_clear_error (&error);
+ g_error_free (error);
}
g_free (xml);
@@ -928,7 +932,7 @@ container_has_focusable_child (GtkContainer *container)
}
}
g_list_free (list);
- return retval;
+ return retval;
}
static void
@@ -1010,13 +1014,11 @@ panel_applet_menu_popup (PanelApplet *applet,
"/PanelAppletPopup");
gtk_menu_popup (GTK_MENU (menu),
NULL, NULL,
- (GtkMenuPositionFunc)panel_applet_position_menu,
+ (GtkMenuPositionFunc) panel_applet_position_menu,
applet,
button, time);
}
-
-
static gboolean
panel_applet_can_focus (GtkWidget *widget)
{
@@ -1244,7 +1246,7 @@ panel_applet_expose (GtkWidget *widget,
x, y, width, height);
return FALSE;
-}
+}
static gboolean
panel_applet_focus (GtkWidget *widget,
@@ -1308,7 +1310,7 @@ panel_applet_parse_color (const gchar *color_str,
color->red = r;
color->green = g;
color->blue = b;
-
+
return TRUE;
}
@@ -1440,7 +1442,7 @@ panel_applet_handle_background_string (PanelApplet *applet,
if (elements [0] && !strcmp (elements [0], "none" )) {
retval = PANEL_NO_BACKGROUND;
-
+
} else if (elements [0] && !strcmp (elements [0], "color")) {
g_return_val_if_fail (color != NULL, PANEL_NO_BACKGROUND);
@@ -1506,8 +1508,7 @@ panel_applet_set_background_string (PanelApplet *applet,
if (applet->priv->background == background)
return;
- if (applet->priv->background && background &&
- strcmp (applet->priv->background, background) == 0)
+ if (g_strcmp0 (applet->priv->background, background) == 0)
return;
if (applet->priv->background)
@@ -1733,7 +1734,7 @@ add_tab_bindings (GtkBindingSet *binding_set,
{
gtk_binding_entry_add_signal (binding_set, GDK_Tab, modifiers,
"move_focus_out_of_applet", 1,
- GTK_TYPE_DIRECTION_TYPE, direction);
+ GTK_TYPE_DIRECTION_TYPE, direction);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Tab, modifiers,
"move_focus_out_of_applet", 1,
GTK_TYPE_DIRECTION_TYPE, direction);
@@ -2183,12 +2184,10 @@ _x_error_handler (Display *display, XErrorEvent *error)
if (!error->error_code)
return 0;
- /*
- * If we got a BadDrawable or a BadWindow, we ignore it for
- * now. FIXME: We need to somehow distinguish real errors
- * from X-server-induced errors. Keeping a list of windows
- * for which we will ignore BadDrawables would be a good idea.
- */
+ /* If we got a BadDrawable or a BadWindow, we ignore it for now.
+ * FIXME: We need to somehow distinguish real errors from
+ * X-server-induced errors. Keeping a list of windows for which we
+ * will ignore BadDrawables would be a good idea. */
if (error->error_code == BadDrawable ||
error->error_code == BadWindow)
return 0;
@@ -2198,19 +2197,19 @@ _x_error_handler (Display *display, XErrorEvent *error)
/*
* To do graphical embedding in the X window system, GNOME Panel
- * uses the classic foreign-window-reparenting trick. The
- * GtkPlug/GtkSocket widgets are used for this purpose. However,
+ * uses the classic foreign-window-reparenting trick. The
+ * GtkPlug/GtkSocket widgets are used for this purpose. However,
* serious robustness problems arise if the GtkSocket end of the
- * connection unexpectedly dies. The X server sends out DestroyNotify
+ * connection unexpectedly dies. The X server sends out DestroyNotify
* events for the descendants of the GtkPlug (i.e., your embedded
- * component's windows) in effectively random order. Furthermore, if
+ * component's windows) in effectively random order. Furthermore, if
* you happened to be drawing on any of those windows when the
* GtkSocket was destroyed (a common state of affairs), an X error
* will kill your application.
*
* To solve this latter problem, GNOME Panel sets up its own X error
* handler which ignores certain X errors that might have been
- * caused by such a scenario. Other X errors get passed to gdk_x_error
+ * caused by such a scenario. Other X errors get passed to gdk_x_error
* normally.
*/
static void
diff --git a/libpanel-applet/panel-applet.h b/libpanel-applet/panel-applet.h
index db64040..dc79c60 100644
--- a/libpanel-applet/panel-applet.h
+++ b/libpanel-applet/panel-applet.h
@@ -91,16 +91,9 @@ struct _PanelAppletClass {
GType panel_applet_get_type (void) G_GNUC_CONST;
GtkWidget *panel_applet_new (void);
-guint32 panel_applet_get_xid (PanelApplet *applet,
- GdkScreen *screen);
-const gchar *panel_applet_get_object_path (PanelApplet *applet);
PanelAppletOrient panel_applet_get_orient (PanelApplet *applet);
-void panel_applet_set_orient (PanelApplet *applet,
- PanelAppletOrient orient);
guint panel_applet_get_size (PanelApplet *applet);
-void panel_applet_set_size (PanelApplet *applet,
- guint size);
PanelAppletBackgroundType
panel_applet_get_background (PanelApplet *applet,
/* return values */
@@ -125,20 +118,17 @@ void panel_applet_set_size_hints (PanelApplet *applet,
int n_elements,
int base_size);
-gboolean panel_applet_get_locked (PanelApplet *applet);
-void panel_applet_set_locked (PanelApplet *applet,
- gboolean locked);
gboolean panel_applet_get_locked_down (PanelApplet *applet);
-void panel_applet_set_locked_down (PanelApplet *applet,
- gboolean locked_down);
+
void panel_applet_request_focus (PanelApplet *applet,
guint32 timestamp);
+
void panel_applet_setup_menu (PanelApplet *applet,
const gchar *xml,
GtkActionGroup *action_group);
-void panel_applet_setup_menu_from_file (PanelApplet *applet,
- const gchar *filename,
- GtkActionGroup *action_group);
+void panel_applet_setup_menu_from_file (PanelApplet *applet,
+ const gchar *filename,
+ GtkActionGroup *action_group);
int panel_applet_factory_main (const gchar *factory_id,
gboolean out_process,
diff --git a/libpanel-applet/test-dbus-applet.c b/libpanel-applet/test-dbus-applet.c
index c35eb8a..ebad238 100644
--- a/libpanel-applet/test-dbus-applet.c
+++ b/libpanel-applet/test-dbus-applet.c
@@ -4,8 +4,8 @@
#include "panel-applet.h"
static void
-test_applet_on_do (GtkAction *action,
- gpointer user_data)
+test_applet_on_do (GtkAction *action,
+ gpointer user_data)
{
g_message ("%s called\n", gtk_action_get_name (action));
}
@@ -193,10 +193,10 @@ test_applet_factory (TestApplet *applet,
gpointer data)
{
gboolean retval = FALSE;
-
+
if (!strcmp (iid, "TestApplet"))
- retval = test_applet_fill (applet);
-
+ retval = test_applet_fill (applet);
+
return retval;
}
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8dab7e5..8abc8e7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,6 @@
# List of source files containing translatable strings.
# Please keep this file sorted alphabetically.
[encoding: UTF-8]
-applets/clock/GNOME_ClockApplet.panel-applet.in.in
applets/clock/calendar-client.c
applets/clock/calendar-window.c
applets/clock/clock.c
@@ -11,14 +10,15 @@ applets/clock/clock-location.c
applets/clock/clock-location-tile.c
applets/clock/clock-utils.c
applets/clock/org.gnome.clockapplet.mechanism.policy.in
-applets/fish/GNOME_FishApplet.panel-applet.in.in
+applets/clock/org.gnome.panel.ClockApplet.panel-applet.in.in
applets/fish/fish.c
[type: gettext/glade]applets/fish/fish.ui
applets/fish/fish.schemas.in
-applets/notification_area/GNOME_NotificationAreaApplet.panel-applet.in.in
-applets/notification_area/na-tray-manager.c
+applets/fish/org.gnome.panel.FishApplet.panel-applet.in.in
applets/notification_area/main.c
-applets/wncklet/GNOME_Wncklet.panel-applet.in.in
+applets/notification_area/na-tray-manager.c
+applets/notification_area/org.gnome.panel.NotificationAreaApplet.panel-applet.in.in
+applets/wncklet/org.gnome.panel.Wncklet.panel-applet.in.in
applets/wncklet/showdesktop.c
applets/wncklet/window-list.c
[type: gettext/glade]applets/wncklet/window-list.ui
@@ -67,10 +67,10 @@ gnome-panel/panel-run-dialog.c
gnome-panel/panel-separator.c
gnome-panel/panel-shell.c
gnome-panel/panel-stock-icons.c
+gnome-panel/panel-test-applets.c
+[type: gettext/glade]gnome-panel/panel-test-applets.ui
gnome-panel/panel-toplevel.c
gnome-panel/panel-toplevel.schemas.in
gnome-panel/panel-util.c
gnome-panel/panel.c
-libpanel-applet/GNOME_Panel_TestApplet.panel-applet.in
-libpanel-applet/panel-test-applets.c
-[type: gettext/glade]libpanel-applet/panel-test-applets.ui
+libpanel-applet/org.gnome.panel.TestApplet.panel-applet.in
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
