summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--applets/notification_area/status-notifier/sn-item-v0.c2
-rw-r--r--applets/wncklet/workspace-switcher.c12
2 files changed, 9 insertions, 5 deletions
diff --git a/applets/notification_area/status-notifier/sn-item-v0.c b/applets/notification_area/status-notifier/sn-item-v0.c
index 46a4c064..509b153e 100644
--- a/applets/notification_area/status-notifier/sn-item-v0.c
+++ b/applets/notification_area/status-notifier/sn-item-v0.c
@@ -256,7 +256,7 @@ update (SnItemV0 *v0)
if (!pixbuf){
/*try to find icons specified by path and filename*/
pixbuf = gdk_pixbuf_new_from_file(v0->icon_name, NULL);
- if (pixbuf){
+ if (pixbuf && icon_size > 1) {
/*An icon specified by path and filename may be the wrong size for the tray */
pixbuf=gdk_pixbuf_scale_simple(pixbuf, icon_size-2, icon_size-2,GDK_INTERP_BILINEAR);
}
diff --git a/applets/wncklet/workspace-switcher.c b/applets/wncklet/workspace-switcher.c
index 2a13cebe..35664db5 100644
--- a/applets/wncklet/workspace-switcher.c
+++ b/applets/wncklet/workspace-switcher.c
@@ -120,7 +120,8 @@ static void update_properties_for_wm(PagerData* pager)
gtk_widget_show(pager->workspace_names_scroll);
if (pager->display_workspaces_toggle)
gtk_widget_show(pager->display_workspaces_toggle);
- g_object_set (pager->cell, "editable", TRUE, NULL);
+ if (pager->cell)
+ g_object_set (pager->cell, "editable", TRUE, NULL);
break;
case PAGER_WM_METACITY:
if (pager->workspaces_frame)
@@ -131,7 +132,8 @@ static void update_properties_for_wm(PagerData* pager)
gtk_widget_show(pager->workspace_names_scroll);
if (pager->display_workspaces_toggle)
gtk_widget_show(pager->display_workspaces_toggle);
- g_object_set (pager->cell, "editable", TRUE, NULL);
+ if (pager->cell)
+ g_object_set (pager->cell, "editable", TRUE, NULL);
break;
case PAGER_WM_I3:
if (pager->workspaces_frame)
@@ -144,7 +146,8 @@ static void update_properties_for_wm(PagerData* pager)
gtk_widget_hide(pager->workspace_names_scroll);
if (pager->display_workspaces_toggle)
gtk_widget_show(pager->display_workspaces_toggle);
- g_object_set (pager->cell, "editable", FALSE, NULL);
+ if (pager->cell)
+ g_object_set (pager->cell, "editable", FALSE, NULL);
break;
case PAGER_WM_COMPIZ:
if (pager->workspaces_frame)
@@ -155,7 +158,8 @@ static void update_properties_for_wm(PagerData* pager)
gtk_widget_hide(pager->workspace_names_scroll);
if (pager->display_workspaces_toggle)
gtk_widget_hide(pager->display_workspaces_toggle);
- g_object_set (pager->cell, "editable", FALSE, NULL);
+ if (pager->cell)
+ g_object_set (pager->cell, "editable", FALSE, NULL);
break;
case PAGER_WM_UNKNOWN:
if (pager->workspaces_frame)