summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaniac <maniac>2007-01-09 08:25:16 +0000
committermaniac <maniac>2007-01-09 08:25:16 +0000
commit2ef37b72d2e9bd56166438dbe1caa088164b6355 (patch)
tree1822673d70345a0b69d1ff5fe2e2546357024922
parentbee238afaab56c8a8b62e18ddfffb8fc68a7cec7 (diff)
downloadberyl-manager-2ef37b72d2e9bd56166438dbe1caa088164b6355.tar.gz
beryl-manager-2ef37b72d2e9bd56166438dbe1caa088164b6355.tar.bz2
beryl-settings & -manager:
- install BSM icon to PREFIX/share/icons/hicolor/scalable/apps for consistency - make beryl-manager use that icon - fix some warnings and screwed indentations in beryl-manager - closes #705
-rw-r--r--src/main.c21
1 files changed, 14 insertions, 7 deletions
diff --git a/src/main.c b/src/main.c
index 500897d..68a092f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -734,6 +734,8 @@ gpointer berylThread(gpointer d)
case CopyRenderPath:
g_strlcat(beryl_command, " --use-copy", BERYL_COMMAND_LINE_SIZE);
break;
+ default:
+ break;
}
switch (renderingMode)
@@ -745,6 +747,8 @@ gpointer berylThread(gpointer d)
case XGLRendering:
g_strlcat(beryl_command, " --xgl-rendering", BERYL_COMMAND_LINE_SIZE);
break;
+ default:
+ break;
}
switch (cowMode)
@@ -755,6 +759,8 @@ gpointer berylThread(gpointer d)
case NoCOW:
g_strlcat(beryl_command, " --no-cow", BERYL_COMMAND_LINE_SIZE);
break;
+ default:
+ break;
}
switch (platformMode)
@@ -768,6 +774,8 @@ gpointer berylThread(gpointer d)
case XGLPlatform:
g_strlcat(beryl_command, " --force-xgl", BERYL_COMMAND_LINE_SIZE);
break;
+ default:
+ break;
}
switch (bindingMode)
@@ -779,6 +787,8 @@ gpointer berylThread(gpointer d)
case XGLBinding:
g_strlcat(beryl_command, " --xgl-binding", BERYL_COMMAND_LINE_SIZE);
break;
+ default:
+ break;
}
if (noGLYield)
@@ -1126,16 +1136,14 @@ void init_menu()
mitem = gtk_image_menu_item_new_with_label(_("Beryl Settings Manager"));
gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(mitem),
- make_image(PIXMAPS_DIR
- "/beryl-settings.svg"));
+ make_image(DATADIR "/icons/hicolor/scalable/apps/beryl-settings.svg"));
gtk_menu_shell_append(GTK_MENU_SHELL(menu), mitem);
gtk_widget_show(mitem);
g_signal_connect(mitem, "activate", G_CALLBACK(startApp),
"beryl-settings");
mitem = gtk_image_menu_item_new_with_label(_("Emerald Theme Manager"));
gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(mitem),
- make_image(PIXMAPS_DIR
- "/emerald-theme-manager-icon.png"));
+ make_image(PIXMAPS_DIR "/emerald-theme-manager-icon.png"));
gtk_menu_shell_append(GTK_MENU_SHELL(menu), mitem);
gtk_widget_show(mitem);
g_signal_connect(mitem, "activate", G_CALLBACK(startApp),
@@ -1147,15 +1155,14 @@ void init_menu()
mitem = gtk_image_menu_item_new_with_label(_("Reload Window Manager"));
gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(mitem),
- gtk_image_new_from_stock(GTK_STOCK_REFRESH,
- GTK_ICON_SIZE_MENU));
+ gtk_image_new_from_stock(GTK_STOCK_REFRESH, GTK_ICON_SIZE_MENU));
g_signal_connect(mitem, "activate", G_CALLBACK(reloadWM), NULL);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), mitem);
gtk_widget_show(mitem);
mitem = gtk_image_menu_item_new_with_label(_("Select Window Manager"));
gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(mitem),
- make_image(PIXMAPS_DIR "/wm-select.png"));
+ make_image(PIXMAPS_DIR "/wm-select.png"));
gtk_menu_shell_append(GTK_MENU_SHELL(menu), mitem);
gtk_widget_show(mitem);